@chevre/domain 21.8.0-alpha.9 → 21.8.0

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

@@ -18,6 +18,7 @@ const moment = require("moment-timezone");
 const event_1 = require("../../../repo/event");
 const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
+const findEventOffers_1 = require("./findEventOffers");
 const debug = createDebug('chevre-domain:service');
 /**
  * イベントデータをID指定で集計する
@@ -31,7 +32,7 @@ function aggregateScreeningEvent(params) {
         let aggregatingEvents = [event];
         // プロジェクト限定(2023-02-22~)
         if (settings_1.settings.useOfferRateLimitProjects.includes(event.project.id)) {
-            const availableOffers = yield findOffers({ event })(repos);
+            const availableOffers = yield (0, findEventOffers_1.findEventOffers)({ 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暫定対応)
@@ -133,7 +134,7 @@ function aggregateOfferByEvent(params) {
         var _a, _b, _c;
         // プロジェクト限定(2023-02-22~)
         if (settings_1.settings.useAggregateOfferProjects.includes(params.event.project.id)) {
-            const availableOffers = yield findOffers(params)(repos);
+            const availableOffers = yield (0, findEventOffers_1.findEventOffers)(params)(repos);
             // オファーごとの予約集計
             const offersWithAggregateReservation = [];
             for (const o of availableOffers) {
@@ -163,45 +164,6 @@ function aggregateOfferByEvent(params) {
         }
     });
 }
-/**
- * イベントオファー検索
- * NotFoundエラーをハンドリングする
- */
-function findOffers(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        let availableOffers = [];
-        try {
-            // 興行設定があれば興行のカタログを参照する(2022-08-31~)
-            const eventOffers = params.event.offers;
-            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 }, ['hasOfferCatalog'], []);
-                if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
-                    const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
-                        offerCatalog: { id: eventService.hasOfferCatalog.id },
-                        excludeAppliesToMovieTicket: false,
-                        sort: false // ソート不要(2023-01-27~)
-                    });
-                    availableOffers = findOffersByOfferCatalogIdResult.offers;
-                }
-            }
-            else {
-                throw new factory.errors.NotFound('event.offers.itemOffered.id');
-            }
-        }
-        catch (error) {
-            let throwsError = true;
-            // 万が一カタログが見つからない場合に対応
-            if (error instanceof factory.errors.NotFound) {
-                throwsError = false;
-            }
-            if (throwsError) {
-                throw error;
-            }
-        }
-        return availableOffers;
-    });
-}
 function calculateOfferCount(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;

package/lib/chevre/service/aggregation/event/aggregateUseActionsOnEvent.d.ts

@@ -1,12 +1,14 @@
 import { MongoRepository as ActionRepo } from '../../../repo/action';
 import { MongoRepository as EventRepo } from '../../../repo/event';
 import { MongoRepository as OfferRepo } from '../../../repo/offer';
+import { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
 import { MongoRepository as PlaceRepo } from '../../../repo/place';
 import { MongoRepository as ProductRepo } from '../../../repo/product';
 export type IAggregateOperation<T> = (repos: {
     action: ActionRepo;
     event: EventRepo;
     offer: OfferRepo;
+    offerCatalog: OfferCatalogRepo;
     place: PlaceRepo;
     product: ProductRepo;
 }) => Promise<T>;

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

@@ -15,6 +15,7 @@ exports.aggregateUseActionsOnEvent = void 0;
  */
 const createDebug = require("debug");
 const factory = require("../../../factory");
+const findEventOffers_1 = require("./findEventOffers");
 const debug = createDebug('chevre-domain:service');
 function aggregateUseActionsOnEvent(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -88,45 +89,6 @@ function findEntranceGates(params) {
         return movieTheater === null || movieTheater === void 0 ? void 0 : movieTheater.hasEntranceGate;
     });
 }
-/**
- * イベントオファー検索
- * NotFoundエラーをハンドリングする
- */
-function findOffers(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        let availableOffers = [];
-        try {
-            // 興行設定があれば興行のカタログを参照する(2022-08-31~)
-            const eventOffers = params.event.offers;
-            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 }, ['hasOfferCatalog'], []);
-                if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
-                    const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
-                        offerCatalog: { id: eventService.hasOfferCatalog.id },
-                        excludeAppliesToMovieTicket: false,
-                        sort: false // ソート不要(2023-01-27~)
-                    });
-                    availableOffers = findOffersByOfferCatalogIdResult.offers;
-                }
-            }
-            else {
-                throw new factory.errors.NotFound('event.offers.itemOffered.id');
-            }
-        }
-        catch (error) {
-            let throwsError = true;
-            // 万が一カタログが見つからない場合に対応
-            if (error instanceof factory.errors.NotFound) {
-                throwsError = false;
-            }
-            if (throwsError) {
-                throw error;
-            }
-        }
-        return availableOffers;
-    });
-}
 /**
  * 入場ゲートごとに集計する
  */
@@ -135,7 +97,7 @@ function aggregateEntranceGateByEvent(params) {
         // 入場ゲートの予約使用アクション集計
         const places = [];
         if (Array.isArray(params.entranceGates) && params.entranceGates.length > 0) {
-            const availableOffers = yield findOffers(params)(repos);
+            const availableOffers = yield (0, findEventOffers_1.findEventOffers)(params)(repos);
             // 念のため、identifierの存在する入場ゲートに絞る
             const entranceGates = params.entranceGates.filter((e) => {
                 return typeof e.identifier === 'string' && e.identifier.length > 0;

package/lib/chevre/service/aggregation/event/findEventOffers.d.ts

@@ -0,0 +1,16 @@
+import { IMinimizedIndividualEvent } from '../../../repo/event';
+import { MongoRepository as OfferRepo } from '../../../repo/offer';
+import { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
+import { MongoRepository as ProductRepo } from '../../../repo/product';
+import * as factory from '../../../factory';
+/**
+ * イベントオファー検索
+ * NotFoundエラーをハンドリングする
+ */
+export declare function findEventOffers(params: {
+    event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>;
+}): (repos: {
+    offer: OfferRepo;
+    offerCatalog: OfferCatalogRepo;
+    product: ProductRepo;
+}) => Promise<factory.unitPriceOffer.IUnitPriceOffer[]>;

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

@@ -0,0 +1,58 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findEventOffers = void 0;
+const factory = require("../../../factory");
+/**
+ * イベントオファー検索
+ * NotFoundエラーをハンドリングする
+ */
+function findEventOffers(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        let availableOffers = [];
+        try {
+            // 興行設定があれば興行のカタログを参照する
+            const eventOffers = params.event.offers;
+            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 }, ['hasOfferCatalog'], []);
+                const offerCatalogId = (_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id;
+                if (typeof offerCatalogId === 'string') {
+                    // サブカタログIDを決定
+                    let subOfferCatalogId = offerCatalogId;
+                    const offerCatalogFirstElement = yield repos.offerCatalog.findFirstItemListElementById({ id: offerCatalogId });
+                    if (offerCatalogFirstElement.typeOf === 'OfferCatalog') {
+                        subOfferCatalogId = offerCatalogFirstElement.id;
+                    }
+                    const { offers } = yield repos.offer.searchAllByOfferCatalogId({
+                        subOfferCatalog: { id: subOfferCatalogId }
+                    });
+                    availableOffers = offers;
+                }
+            }
+            else {
+                throw new factory.errors.NotFound('event.offers.itemOffered.id');
+            }
+        }
+        catch (error) {
+            let throwsError = true;
+            // 万が一カタログが見つからない場合に対応
+            if (error instanceof factory.errors.NotFound) {
+                throwsError = false;
+            }
+            if (throwsError) {
+                throw error;
+            }
+        }
+        return availableOffers;
+    });
+}
+exports.findEventOffers = findEventOffers;

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

@@ -15,9 +15,9 @@ function validateAccount(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
         // 引き出し口座の存在を確認する
-        const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.typeOf;
+        const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
         if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
+            throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         const accountNumber = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.accountId;
         if (typeof accountNumber !== 'string') {

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

@@ -8,16 +8,16 @@ const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
 // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createStartParams(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
     const paymentServiceId = (params.paymentService !== undefined)
         ? String(params.paymentService.id)
         : '';
     const paymentMethodType = (params.paymentService !== undefined)
         // FaceToFace以外は、プロダクトから決済方法タイプを自動取得
         ? (_a = params.paymentService.serviceType) === null || _a === void 0 ? void 0 : _a.codeValue
-        : (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.typeOf;
+        : (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
     if (typeof paymentMethodType !== 'string') {
-        throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
+        throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
     }
     let totalPaymentDue;
     switch (params.paymentServiceType) {
@@ -68,10 +68,16 @@ function createStartParams(params) {
         }
     }
     else if (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard) {
+        const creditCardPaymentServiceOutput = (_l = params.paymentService) === null || _l === void 0 ? void 0 : _l.serviceOutput;
+        const invoiceAsServiceOutput = (Array.isArray(creditCardPaymentServiceOutput))
+            ? creditCardPaymentServiceOutput.find((output) => output.typeOf === 'Invoice')
+            : creditCardPaymentServiceOutput;
         // カード通貨区分が存在すれば適用
-        const creditCardAsPaymentServiceOutputCurrency = (_p = (_o = (_m = (_l = params.paymentService) === null || _l === void 0 ? void 0 : _l.serviceOutput) === null || _m === void 0 ? void 0 : _m.paymentMethod) === null || _o === void 0 ? void 0 : _o.amount) === null || _p === void 0 ? void 0 : _p.currency;
-        if (typeof creditCardAsPaymentServiceOutputCurrency === 'string') {
-            paymentMethodCurrency = creditCardAsPaymentServiceOutputCurrency;
+        if ((invoiceAsServiceOutput === null || invoiceAsServiceOutput === void 0 ? void 0 : invoiceAsServiceOutput.typeOf) === 'Invoice') {
+            const creditCardAsPaymentServiceOutputCurrency = (_o = (_m = invoiceAsServiceOutput.paymentMethod) === null || _m === void 0 ? void 0 : _m.amount) === null || _o === void 0 ? void 0 : _o.currency;
+            if (typeof creditCardAsPaymentServiceOutputCurrency === 'string') {
+                paymentMethodCurrency = creditCardAsPaymentServiceOutputCurrency;
+            }
         }
     }
     const paymentMethodAmount = {
@@ -79,22 +85,24 @@ function createStartParams(params) {
         currency: paymentMethodCurrency,
         value: params.amount
     };
-    const paymentMethod = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ additionalProperty: (Array.isArray((_q = params.object.paymentMethod) === null || _q === void 0 ? void 0 : _q.additionalProperty))
-            ? (_r = params.object.paymentMethod) === null || _r === void 0 ? void 0 : _r.additionalProperty
-            : [], name: (typeof ((_s = params.object.paymentMethod) === null || _s === void 0 ? void 0 : _s.name) === 'string')
+    const paymentMethod = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ additionalProperty: (Array.isArray((_p = params.object.paymentMethod) === null || _p === void 0 ? void 0 : _p.additionalProperty))
+            ? (_q = params.object.paymentMethod) === null || _q === void 0 ? void 0 : _q.additionalProperty
+            : [], name: (typeof ((_r = params.object.paymentMethod) === null || _r === void 0 ? void 0 : _r.name) === 'string')
             ? params.object.paymentMethod.name
             : paymentMethodType, 
         // MonetaryAmount対応(2023-08-14~)
-        amount: (settings_1.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT) ? paymentMethodAmount : params.amount, paymentMethodId: params.transactionNumber, typeOf: paymentMethodType }, (typeof ((_t = params.object.paymentMethod) === null || _t === void 0 ? void 0 : _t.description) === 'string')
-        ? { description: (_u = params.object.paymentMethod) === null || _u === void 0 ? void 0 : _u.description }
+        amount: (settings_1.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT) ? paymentMethodAmount : params.amount, 
+        // paymentMethodId: params.transactionNumber, // object.paymentMethodIdへ完全移行(2023-08-30~)
+        identifier: paymentMethodType }, (typeof ((_s = params.object.paymentMethod) === null || _s === void 0 ? void 0 : _s.description) === 'string')
+        ? { description: (_t = params.object.paymentMethod) === null || _t === void 0 ? void 0 : _t.description }
         : undefined), (totalPaymentDue !== undefined)
         ? { totalPaymentDue: totalPaymentDue }
-        : undefined), (typeof accountId === 'string') ? { accountId: accountId } : undefined), (typeof ((_v = params.object.paymentMethod) === null || _v === void 0 ? void 0 : _v.method) === 'string')
-        ? { method: (_w = params.object.paymentMethod) === null || _w === void 0 ? void 0 : _w.method }
-        : undefined), (((_x = params.object.paymentMethod) === null || _x === void 0 ? void 0 : _x.creditCard) !== undefined)
-        ? { creditCard: (_y = params.object.paymentMethod) === null || _y === void 0 ? void 0 : _y.creditCard }
-        : undefined), (Array.isArray((_z = params.object.paymentMethod) === null || _z === void 0 ? void 0 : _z.movieTickets))
-        ? { movieTickets: (_0 = params.object.paymentMethod) === null || _0 === void 0 ? void 0 : _0.movieTickets }
+        : undefined), (typeof accountId === 'string') ? { accountId: accountId } : undefined), (typeof ((_u = params.object.paymentMethod) === null || _u === void 0 ? void 0 : _u.method) === 'string')
+        ? { method: (_v = params.object.paymentMethod) === null || _v === void 0 ? void 0 : _v.method }
+        : undefined), (((_w = params.object.paymentMethod) === null || _w === void 0 ? void 0 : _w.creditCard) !== undefined)
+        ? { creditCard: (_x = params.object.paymentMethod) === null || _x === void 0 ? void 0 : _x.creditCard }
+        : undefined), (Array.isArray((_y = params.object.paymentMethod) === null || _y === void 0 ? void 0 : _y.movieTickets))
+        ? { movieTickets: (_z = params.object.paymentMethod) === null || _z === void 0 ? void 0 : _z.movieTickets }
         : undefined);
     const object = {
         // パラメータから必要なもののみ取り込む
@@ -105,7 +113,7 @@ function createStartParams(params) {
         onPaymentStatusChanged: { informPayment: informPaymentParams },
         paymentMethod
     };
-    return Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, transactionNumber: params.transactionNumber, typeOf: factory.assetTransactionType.Pay, agent: params.agent, recipient: params.recipient, object, expires: params.expires }, (typeof ((_1 = params.location) === null || _1 === void 0 ? void 0 : _1.typeOf) === 'string')
+    return Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, transactionNumber: params.transactionNumber, typeOf: factory.assetTransactionType.Pay, agent: params.agent, recipient: params.recipient, object, expires: params.expires }, (typeof ((_0 = params.location) === null || _0 === void 0 ? void 0 : _0.typeOf) === 'string')
         ? { location: params.location }
         : undefined);
 }

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

@@ -33,9 +33,9 @@ function createPayObject(params) {
     var _a;
     const transaction = params.transaction;
     const paymentMethod = transaction.object.paymentMethod;
-    const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.typeOf);
+    const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.identifier);
     const additionalProperty = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.additionalProperty;
-    const paymentMethodId = (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.paymentMethodId) === 'string') ? paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.paymentMethodId : transaction.id;
+    const paymentMethodId = transaction.object.paymentMethodId;
     const paymentMethodName = (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.name) === 'string') ? paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.name : paymentMethodType;
     // MonetaryAmount対応(2023-08-13~)
     const paymentMethodAmountValue = (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.amount) === 'number')
@@ -139,7 +139,7 @@ function createPayObjectServiceOutput(params) {
             // }
             break;
         case factory.service.paymentService.PaymentServiceType.MovieTicket:
-            const paymentMethodType = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.typeOf;
+            const paymentMethodType = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.identifier;
             const movieTickets = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets;
             if (Array.isArray(movieTickets)) {
                 paymentServiceOutput = movieTickets.map((movieTicket) => {

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

@@ -12,8 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchGMOTrade = exports.exportTasksById = exports.cancel = exports.confirm = exports.start = exports.check = exports.invalidatePaymentUrl = exports.publishPaymentUrl = void 0;
 const moment = require("moment");
 const factory = require("../../factory");
-const settings_1 = require("../../settings");
-const payment_1 = require("../payment");
 const CreditCardPayment = require("../payment/creditCard");
 const MovieTicketPayment = require("../payment/movieTicket");
 const PaymentCardPayment = require("../payment/paymentCard");
@@ -205,7 +203,7 @@ function fixPaymentService(params) {
 }
 function validateSeller(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const sellerId = (_a = params.recipient) === null || _a === void 0 ? void 0 : _a.id;
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
@@ -219,14 +217,26 @@ function validateSeller(params) {
         if (seller === undefined) {
             throw new factory.errors.NotFound(factory.organizationType.Corporation);
         }
-        const paymentMethodType = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.typeOf;
+        const paymentMethodType = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
         if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
+            throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
-        // 販売者の対応決済方法かどうか確認
-        const paymentAccepted = (_c = seller.paymentAccepted) === null || _c === void 0 ? void 0 : _c.some((a) => a.paymentMethodType === paymentMethodType);
-        if (paymentAccepted !== true) {
-            throw new factory.errors.Argument('object.paymentMethod.typeOf', `payment not accepted`);
+        // FaceToFaceの場合、決済方法区分未指定に対応(2023-08-29~)
+        if (params.object.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
+            if (paymentMethodType.length > 0) {
+                // 販売者の対応決済方法かどうか確認
+                const paymentAccepted = (_c = seller.paymentAccepted) === null || _c === void 0 ? void 0 : _c.some((a) => a.paymentMethodType === paymentMethodType);
+                if (paymentAccepted !== true) {
+                    throw new factory.errors.Argument('object.paymentMethod.identifier', `payment not accepted`);
+                }
+            }
+        }
+        else {
+            // 販売者の対応決済方法かどうか確認
+            const paymentAccepted = (_d = seller.paymentAccepted) === null || _d === void 0 ? void 0 : _d.some((a) => a.paymentMethodType === paymentMethodType);
+            if (paymentAccepted !== true) {
+                throw new factory.errors.Argument('object.paymentMethod.identifier', `payment not accepted`);
+            }
         }
     });
 }
@@ -301,6 +311,7 @@ function saveAuthorizeResult(params) {
  */
 function confirm(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         let transaction;
         // 取引存在確認
         if (typeof params.id === 'string') {
@@ -318,29 +329,24 @@ function confirm(params) {
         else {
             throw new factory.errors.ArgumentNull('Transaction ID or Transaction Number');
         }
+        let overwritingPaymentMethodIdentifier;
+        if (transaction.object.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
+            const specifiedPaymentMethodIdentifire = (_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
+            if (typeof specifiedPaymentMethodIdentifire === 'string' && specifiedPaymentMethodIdentifire.length > 0) {
+                overwritingPaymentMethodIdentifier = specifiedPaymentMethodIdentifire;
+                transaction.object.paymentMethod.identifier = overwritingPaymentMethodIdentifier;
+                // transaction.object.paymentMethod.typeOf = overwritingPaymentMethodIdentifier;
+            }
+        }
         const order = yield fixOrderAsPurpose(params, transaction)(repos);
         const potentialActions = (0, potentialActions_1.createPotentialActions)({
             transaction: transaction,
             potentialActions: params.potentialActions,
             order
         });
-        yield repos.assetTransaction.confirm({
-            typeOf: factory.assetTransactionType.Pay,
-            id: transaction.id,
-            result: {},
-            // sync対応(2023-01-14~)
-            potentialActions: (settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING)
-                ? { pay: [] }
-                : potentialActions
-        });
-        // sync対応(2023-01-14~)
-        if (settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING) {
-            if (Array.isArray(potentialActions.pay)) {
-                for (const payAction of potentialActions.pay) {
-                    yield (0, payment_1.pay)(payAction)(repos);
-                }
-            }
-        }
+        yield repos.assetTransaction.confirm(Object.assign({ typeOf: factory.assetTransactionType.Pay, id: transaction.id, result: {}, potentialActions: potentialActions }, (typeof overwritingPaymentMethodIdentifier === 'string')
+            ? { object: { paymentMethod: { identifier: overwritingPaymentMethodIdentifier } } }
+            : undefined));
     });
 }
 exports.confirm = confirm;
@@ -373,23 +379,11 @@ function fixOrderAsPurpose(params, transaction) {
  */
 function cancel(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.assetTransaction.cancel({
+        yield repos.assetTransaction.cancel({
             typeOf: factory.assetTransactionType.Pay,
             id: params.id,
             transactionNumber: params.transactionNumber
         });
-        // sync対応(2023-01-14~)
-        if (settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING) {
-            const payTransactionAsObject = {
-                project: transaction.project,
-                typeOf: transaction.typeOf,
-                id: transaction.id,
-                transactionNumber: transaction.transactionNumber,
-                object: transaction.object,
-                recipient: transaction.recipient
-            };
-            yield (0, payment_1.voidPayment)({ object: payTransactionAsObject })(repos);
-        }
     });
 }
 exports.cancel = cancel;
@@ -404,6 +398,9 @@ function exportTasksById(params) {
             id: params.id
         });
         const potentialActions = transaction.potentialActions;
+        if (transaction.status === factory.transactionStatusType.InProgress) {
+            throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
+        }
         const taskAttributes = [];
         // タスク実行日時バッファの指定があれば調整
         let taskRunsAt = new Date();
@@ -430,6 +427,31 @@ function exportTasksById(params) {
             executionResults: [],
             data: { object: payTransactionAsObject }
         };
+        // OnAssetTransactionStatusChangedを追加(2023-08-30~)
+        const onAssetTransactionStatusChangedTaskData = {
+            project: transaction.project,
+            object: {
+                typeOf: factory.assetTransactionType.Pay,
+                transactionNumber: transaction.transactionNumber,
+                status: transaction.status
+            },
+            purpose: {
+                confirmationNumber: '',
+                orderNumber: '',
+                typeOf: 'Order'
+            },
+            useOnOrderStatusChanged: true
+        };
+        const onAssetTransactionStatusChangedTask = {
+            project: transaction.project,
+            name: factory.taskName.OnAssetTransactionStatusChanged,
+            status: factory.taskStatus.Ready,
+            runsAt: taskRunsAt,
+            remainingNumberOfTries: 10,
+            numberOfTried: 0,
+            executionResults: [],
+            data: onAssetTransactionStatusChangedTaskData
+        };
         switch (transaction.status) {
             case factory.transactionStatusType.Confirmed:
                 const payActions = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.pay;
@@ -450,13 +472,10 @@ function exportTasksById(params) {
                 }
                 break;
             case factory.transactionStatusType.Canceled:
-                // sync対応(2023-01-14~)
-                if (!settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING) {
-                    taskAttributes.push(voidPaymentTasks);
-                }
+                taskAttributes.push(voidPaymentTasks, onAssetTransactionStatusChangedTask);
                 break;
             case factory.transactionStatusType.Expired:
-                taskAttributes.push(voidPaymentTasks);
+                taskAttributes.push(voidPaymentTasks, onAssetTransactionStatusChangedTask);
                 break;
             default:
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
@@ -482,9 +501,9 @@ function searchGMOTrade(params) {
         //     throw new factory.errors.Argument('transactionNumber', 'must be confirmed');
         // }
         // CreditCard系統の決済方法タイプは動的
-        const paymentMethodType = (_a = assetTransaction.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.typeOf;
+        const paymentMethodType = (_a = assetTransaction.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
         if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
+            throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         const paymentServiceId = String(assetTransaction.object.id);
         const availableChannel = yield repos.product.findAvailableChannel({

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

@@ -6,7 +6,7 @@ exports.createStartParams = void 0;
  */
 const factory = require("../../../factory");
 function createStartParams(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.typeOf;
     if (typeof paymentMethodType !== 'string') {
         throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
@@ -23,7 +23,13 @@ function createStartParams(params) {
     let refundFee;
     if (((_g = params.paymentService) === null || _g === void 0 ? void 0 : _g.typeOf) === factory.service.paymentService.PaymentServiceType.CreditCard) {
         // カード通貨区分の存在する決済サービスを考慮(2023-08-09~)
-        const paymentServiceOutputAmountCurrency = (_k = (_j = (_h = params.paymentService.serviceOutput) === null || _h === void 0 ? void 0 : _h.paymentMethod) === null || _j === void 0 ? void 0 : _j.amount) === null || _k === void 0 ? void 0 : _k.currency;
+        const invoiceAsServiceOutput = (Array.isArray(params.paymentService.serviceOutput))
+            ? params.paymentService.serviceOutput.find((output) => output.typeOf === 'Invoice')
+            : params.paymentService.serviceOutput;
+        let paymentServiceOutputAmountCurrency;
+        if ((invoiceAsServiceOutput === null || invoiceAsServiceOutput === void 0 ? void 0 : invoiceAsServiceOutput.typeOf) === 'Invoice') {
+            paymentServiceOutputAmountCurrency = (_j = (_h = invoiceAsServiceOutput === null || invoiceAsServiceOutput === void 0 ? void 0 : invoiceAsServiceOutput.paymentMethod) === null || _h === void 0 ? void 0 : _h.amount) === null || _j === void 0 ? void 0 : _j.currency;
+        }
         if (typeof paymentServiceOutputAmountCurrency !== 'string') {
             if (typeof params.object.refundFee === 'number') {
                 refundFee = params.object.refundFee;

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

@@ -94,7 +94,8 @@ function createTransactionObject(params) {
             ids: params.acceptedOffers.map((o) => o.id),
             itemOffered: { id: String(params.product.id) },
             onlyValid: true,
-            addSortIndex: false
+            addSortIndex: false,
+            useIncludeInDataCatalog: false
         })(repos);
         const transactionObject = [];
         for (const acceptedOffer of params.acceptedOffers) {