@chevre/domain 21.8.0-alpha.9 → 21.8.0

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

@@ -1,5 +1,6 @@
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
+import { MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
 import { MongoRepository as TaskRepo } from '../../repo/task';
 interface ICheckInReservationParams {
@@ -22,12 +23,19 @@ interface ICheckInReservationParams {
             ids?: string[];
         };
     };
+    purpose: {
+        /**
+         * 承認コード
+         */
+        code: string;
+    };
 }
 export declare function checkInReservation(params: ICheckInReservationParams & {
     reserveIfNotYet: boolean;
 }): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
+    event: EventRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
 }) => Promise<void>;

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

@@ -58,8 +58,9 @@ function checkInReservation(params) {
                 ids: checkedInReservationIds,
                 reservationFor: params.object.reservationFor
             },
-            now
-        })({ task: repos.task });
+            now,
+            purpose: params.purpose
+        })({ event: repos.event, task: repos.task });
     });
 }
 exports.checkInReservation = checkInReservation;

package/lib/chevre/service/reserve/potentialActions/onReservationCanceled.d.ts

@@ -1,3 +1,6 @@
+/**
+ * 予約取消時アクション
+ */
 import * as factory from '../../../factory';
 import { MongoRepository as TaskRepo } from '../../../repo/task';
 type IEventReservation = factory.reservation.IReservation<factory.reservationType.EventReservation>;

package/lib/chevre/service/reserve/potentialActions/onReservationCanceled.js

@@ -13,7 +13,6 @@ exports.onReservationCanceled = void 0;
 /**
  * 予約取消時アクション
  */
-const moment = require("moment");
 const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
 const offer_1 = require("../../offer");
@@ -33,6 +32,7 @@ useInformReservation,
  */
 reservationFor) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         if (Array.isArray(canceledReservations) && canceledReservations.length > 0) {
             const now = new Date();
             const project = canceledReservations[0].project;
@@ -41,9 +41,7 @@ reservationFor) {
             if (useInformReservation) {
                 if (Array.isArray(informReservations)) {
                     // やや遅延させる(確定通知が未達の可能性を考慮して)
-                    const informTaskRunsAt = moment(now)
-                        .add(settings_1.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS, 'seconds')
-                        .toDate();
+                    const informTaskRunsAt = now;
                     const reservations4inform = canceledReservations.map((r) => {
                         return {
                             typeOf: r.typeOf,
@@ -99,7 +97,8 @@ reservationFor) {
             yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
                 project: { id: reservationFor.project.id },
                 reservationFor: [{ id: reservationFor.id }],
-                force: false
+                force: false,
+                identifier: `onReservationCanceled:${(_a = canceledReservations === null || canceledReservations === void 0 ? void 0 : canceledReservations[0]) === null || _a === void 0 ? void 0 : _a.reservationNumber}`
             })({ task: repos.task });
         }
     });

package/lib/chevre/service/reserve/potentialActions/onReservationCheckedIn.d.ts

@@ -1,3 +1,4 @@
+import { MongoRepository as EventRepo } from '../../../repo/event';
 import { MongoRepository as TaskRepo } from '../../../repo/task';
 export declare function onReservationCheckedIn(params: {
     project: {
@@ -20,6 +21,13 @@ export declare function onReservationCheckedIn(params: {
         };
     };
     now: Date;
+    purpose: {
+        /**
+         * 承認コード
+         */
+        code: string;
+    };
 }): (repos: {
+    event: EventRepo;
     task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/reserve/potentialActions/onReservationCheckedIn.js

@@ -13,7 +13,6 @@ exports.onReservationCheckedIn = void 0;
 /**
  * 予約発券時アクション
  */
-const moment = require("moment");
 const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
 const offer_1 = require("../../offer");
@@ -28,10 +27,7 @@ function onReservationCheckedIn(params) {
         const project = { id: params.project.id, typeOf: factory.organizationType.Project };
         // inform galobally
         if (Array.isArray(informReservations)) {
-            // やや遅延させる(確定通知が未達の可能性を考慮して)
-            const informTaskRunsAt = moment(params.now)
-                .add(settings_1.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS, 'seconds')
-                .toDate();
+            const informTaskRunsAt = params.now;
             informReservations.forEach((informReservation) => {
                 var _a;
                 const informUrl = String((_a = informReservation.recipient) === null || _a === void 0 ? void 0 : _a.url);
@@ -111,13 +107,22 @@ function onReservationCheckedIn(params) {
         // 冗長な作成を避ける
         const reservationForIds = (_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.ids;
         if (Array.isArray(reservationForIds)) {
-            // イベント集計タスクを追加
+            // 集計タスクを追加
             yield Promise.all(reservationForIds.map((reservationForId) => __awaiter(this, void 0, void 0, function* () {
-                yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
-                    project: { id: params.project.id },
-                    reservationFor: [{ id: reservationForId }],
-                    force: false
-                })({ task: repos.task });
+                var _b;
+                // すでにイベントが削除されているケースに備えて、イベント存在検証(2023-09-12~)
+                const existingEvents = yield repos.event.search({
+                    id: { $eq: reservationForId },
+                    typeOfIn: [factory.eventType.Event, factory.eventType.ScreeningEvent] // 指定しないとArgumentNullError
+                }, { _id: 1 });
+                if (existingEvents.length > 0) {
+                    yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
+                        project: { id: params.project.id },
+                        reservationFor: [{ id: reservationForId }],
+                        force: false,
+                        identifier: `onReservationCheckedIn:${(_b = params.purpose) === null || _b === void 0 ? void 0 : _b.code}`
+                    })({ task: repos.task });
+                }
             })));
         }
     });

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js

@@ -70,7 +70,8 @@ function onReservationConfirmed(confirmedReservations) {
             yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
                 project: confirmedReservations[0].project,
                 reservationFor: [{ id: confirmedReservations[0].reservationFor.id }],
-                force: false
+                force: false,
+                identifier: `onReservationConfirmed:${confirmedReservations[0].reservationNumber}`
             })({ task: repos.task });
             const now = new Date();
             const taskAttributes = [];

package/lib/chevre/service/reserve/potentialActions/onReservationUsed.d.ts

@@ -1,3 +1,6 @@
+/**
+ * 予約使用時アクション
+ */
 import * as factory from '../../../factory';
 import { MongoRepository as TaskRepo } from '../../../repo/task';
 type IEventReservation = factory.reservation.IReservation<factory.reservationType.EventReservation>;

package/lib/chevre/service/reserve/potentialActions/onReservationUsed.js

@@ -13,7 +13,6 @@ exports.onReservationUsed = void 0;
 /**
  * 予約使用時アクション
  */
-const moment = require("moment");
 const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
 const offer_1 = require("../../offer");
@@ -30,9 +29,7 @@ function onReservationUsed(action, attendedReservation) {
         // inform galobally
         if (Array.isArray(informReservations)) {
             // やや遅延させる(確定通知が未達の可能性を考慮して)
-            const informTaskRunsAt = moment(now)
-                .add(settings_1.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS, 'seconds')
-                .toDate();
+            const informTaskRunsAt = now;
             const reservation4inform = {
                 typeOf: attendedReservation.typeOf,
                 project: attendedReservation.project,
@@ -102,7 +99,8 @@ function onReservationUsed(action, attendedReservation) {
         yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
             project: attendedReservation.project,
             reservationFor: [{ id: attendedReservation.reservationFor.id }],
-            force: false
+            force: false,
+            identifier: `onReservationUsed:${attendedReservation.id}`
         })({ task: repos.task });
     });
 }

package/lib/chevre/service/task/aggregateUseActionsOnEvent.js

@@ -14,6 +14,7 @@ const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const event_1 = require("../../repo/event");
 const offer_1 = require("../../repo/offer");
+const offerCatalog_1 = require("../../repo/offerCatalog");
 const place_1 = require("../../repo/place");
 const product_1 = require("../../repo/product");
 const AggregationService = require("../aggregation");
@@ -29,6 +30,7 @@ function call(data) {
             action: new action_1.MongoRepository(settings.connection),
             event: new event_1.MongoRepository(settings.connection),
             offer: new offer_1.MongoRepository(settings.connection),
+            offerCatalog: new offerCatalog_1.MongoRepository(settings.connection),
             place: new place_1.MongoRepository(settings.connection),
             product: new product_1.MongoRepository(settings.connection)
         });

package/lib/chevre/service/task/confirmPayTransaction.js

@@ -13,7 +13,6 @@ exports.call = void 0;
 const factory = require("../../factory");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
-const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
@@ -41,8 +40,7 @@ function call(data) {
             project: new project_1.MongoRepository(settings.connection),
             seller: new seller_1.MongoRepository(settings.connection),
             task: new task_1.MongoRepository(settings.connection),
-            transaction: new transaction_1.MongoRepository(settings.connection),
-            registerServiceInProgress: new registerServiceInProgress_1.RedisRepository(settings.redisClient)
+            transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });
 }

package/lib/chevre/service/task/importOffersFromCOA.js

@@ -13,6 +13,7 @@ exports.call = void 0;
 const COA = require("@motionpicture/coa-service");
 const categoryCode_1 = require("../../repo/categoryCode");
 const offer_1 = require("../../repo/offer");
+const task_1 = require("../../repo/task");
 const credentials_1 = require("../../credentials");
 const OfferService = require("../offer");
 const coaAuthClient = new COA.auth.RefreshToken({
@@ -26,6 +27,7 @@ function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
         const categoryCodeRepo = new categoryCode_1.MongoRepository(settings.connection);
         const offerRepo = new offer_1.MongoRepository(settings.connection);
+        const taskRepo = new task_1.MongoRepository(settings.connection);
         const masterService = new COA.service.Master({
             endpoint: credentials_1.credentials.coa.endpoint,
             auth: coaAuthClient
@@ -33,6 +35,7 @@ function call(data) {
         yield OfferService.event.importFromCOA(data)({
             categoryCode: categoryCodeRepo,
             offer: offerRepo,
+            task: taskRepo,
             masterService
         });
         yield OfferService.event.importCategoryCodesFromCOA(data)({

package/lib/chevre/service/task/onAssetTransactionStatusChanged.d.ts

@@ -0,0 +1,6 @@
+import { IOperation } from '../task';
+import * as factory from '../../factory';
+/**
+ * タスク実行関数
+ */
+export declare function call(data: factory.task.IData<factory.taskName.OnAssetTransactionStatusChanged>): IOperation<void>;

package/lib/chevre/service/task/onAssetTransactionStatusChanged.js

@@ -0,0 +1,37 @@
+"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.call = void 0;
+const factory = require("../../factory");
+const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
+const assetTransaction_1 = require("../../repo/assetTransaction");
+const order_1 = require("../../repo/order");
+const task_1 = require("../../repo/task");
+const transaction_1 = require("../../repo/transaction");
+const onAssetTransactionStatusChanged_1 = require("../order/onAssetTransactionStatusChanged");
+/**
+ * タスク実行関数
+ */
+function call(data) {
+    return (settings) => __awaiter(this, void 0, void 0, function* () {
+        if (settings.redisClient === undefined) {
+            throw new factory.errors.Argument('settings', 'redisClient required');
+        }
+        yield (0, onAssetTransactionStatusChanged_1.onAssetTransactionStatusChanged)(data)({
+            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+            order: new order_1.MongoRepository(settings.connection),
+            registerActionInProgress: new registerServiceInProgress_1.RedisRepository(settings.redisClient),
+            task: new task_1.MongoRepository(settings.connection),
+            transaction: new transaction_1.MongoRepository(settings.connection)
+        });
+    });
+}
+exports.call = call;

package/lib/chevre/service/task/onAuthorizationCreated.js

@@ -14,6 +14,7 @@ const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const code_1 = require("../../repo/code");
+const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const reservation_1 = require("../../repo/reservation");
@@ -28,6 +29,7 @@ function call(data) {
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             code: new code_1.MongoRepository(settings.connection),
+            event: new event_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
             ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),
             reservation: new reservation_1.MongoRepository(settings.connection),
@@ -98,10 +100,12 @@ function onAuthorizationCreated(params) {
                 reservationNumbers: reservationNumbers,
                 reservationFor: { ids: reservationForIds }
             },
-            reserveIfNotYet: params.reserveIfNotYet
+            reserveIfNotYet: params.reserveIfNotYet,
+            purpose: { code: params.code }
         })({
             action: repos.action,
             assetTransaction: repos.assetTransaction,
+            event: repos.event,
             reservation: repos.reservation,
             task: repos.task
         });

package/lib/chevre/service/task/onResourceUpdated/onResourceDeleted.d.ts

@@ -1,6 +1,7 @@
 import * as factory from '../../../factory';
 import { MongoRepository as AccountTitleRepo } from '../../../repo/accountTitle';
 import { MongoRepository as ActionRepo } from '../../../repo/action';
+import { MongoRepository as AggregateOfferRepo } from '../../../repo/aggregateOffer';
 import { MongoRepository as CategoryCodeRepo } from '../../../repo/categoryCode';
 import { MongoRepository as CreativeWorkRepo } from '../../../repo/creativeWork';
 import { MongoRepository as EventRepo } from '../../../repo/event';
@@ -15,6 +16,7 @@ import { MongoRepository as TaskRepo } from '../../../repo/task';
 export declare function onResourceDeleted(params: factory.task.onResourceUpdated.IData): (repos: {
     accountTitle: AccountTitleRepo;
     action: ActionRepo;
+    aggregateOffer: AggregateOfferRepo;
     categoryCode: CategoryCodeRepo;
     creativeWork: CreativeWorkRepo;
     event: EventRepo;

package/lib/chevre/service/task/onResourceUpdated/onResourceDeleted.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onResourceDeleted = void 0;
 const factory = require("../../../factory");
+const syncOfferCatalog_1 = require("./syncOfferCatalog");
 function onResourceDeleted(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const isDeleted = params.isDeleted === true;
@@ -52,6 +53,12 @@ function onResourceDeleted(params) {
                         project: { id: params.project.id },
                         ids: params.id
                     })(repos);
+                    yield (0, syncOfferCatalog_1.syncOfferCatalog)({
+                        project: { id: params.project.id },
+                        ids: params.id,
+                        typeOf: params.typeOf,
+                        isDeleted: true
+                    })(repos);
                     break;
                 case factory.product.ProductType.EventService:
                 case factory.product.ProductType.Product:

package/lib/chevre/service/task/onResourceUpdated/syncOfferCatalog.d.ts

@@ -0,0 +1,17 @@
+import * as factory from '../../../factory';
+import { MongoRepository as AggregateOfferRepo } from '../../../repo/aggregateOffer';
+import { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
+/**
+ * カタログのitemListElementを集計オファーへ同期する
+ */
+export declare function syncOfferCatalog(params: {
+    project: {
+        id: string;
+    };
+    ids: string[];
+    typeOf: factory.task.onResourceUpdated.OfferCatalogType;
+    isDeleted: boolean;
+}): (repos: {
+    aggregateOffer: AggregateOfferRepo;
+    offerCatalog: OfferCatalogRepo;
+}) => Promise<void>;

package/lib/chevre/service/task/onResourceUpdated/syncOfferCatalog.js

@@ -0,0 +1,78 @@
+"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.syncOfferCatalog = void 0;
+const factory = require("../../../factory");
+/**
+ * カタログのitemListElementを集計オファーへ同期する
+ */
+function syncOfferCatalog(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // if (params.ids.length !== 1) {
+        //     throw new factory.errors.Argument('id', 'id.length must be 1');
+        // }
+        var _a, _b;
+        if (params.isDeleted) {
+            for (const offerCatalogId of params.ids) {
+                const offerCatalogs = yield repos.offerCatalog.search({ id: { $in: [offerCatalogId] } });
+                const itemListElementTypeOf = (_a = offerCatalogs.shift()) === null || _a === void 0 ? void 0 : _a.itemListElementTypeOf;
+                switch (itemListElementTypeOf) {
+                    case factory.offerType.Offer:
+                        // カタログを含む全集計オファーからカタログを除外
+                        yield repos.aggregateOffer.pullIncludedInDataCatalog({
+                            project: { id: params.project.id },
+                            $pull: {
+                                includedInDataCatalog: { $elemMatch: { id: { $eq: offerCatalogId } } }
+                            }
+                        });
+                        break;
+                    default:
+                    // no op
+                }
+            }
+        }
+        else {
+            for (const offerCatalogId of params.ids) {
+                const offerCatalogs = yield repos.offerCatalog.search({ id: { $in: [offerCatalogId] } });
+                const itemListElementTypeOf = (_b = offerCatalogs.shift()) === null || _b === void 0 ? void 0 : _b.itemListElementTypeOf;
+                switch (itemListElementTypeOf) {
+                    case factory.offerType.Offer:
+                        // 集計オファーIDリストを検索
+                        const { itemListElement } = yield repos.offerCatalog.findItemListElementById({
+                            id: offerCatalogId,
+                            project: { id: params.project.id }
+                        });
+                        const aggregateOfferIds = itemListElement.map((element) => element.id);
+                        // カタログを含み、かつ、新しいカタログに含まれない集計オファーからカタログを除外
+                        yield repos.aggregateOffer.pullIncludedInDataCatalog(Object.assign({ project: { id: params.project.id }, $pull: {
+                                includedInDataCatalog: { $elemMatch: { id: { $eq: offerCatalogId } } }
+                            } }, (aggregateOfferIds.length > 0) ? { id: { $nin: aggregateOfferIds } } : undefined));
+                        if (aggregateOfferIds.length > 0) {
+                            // 新しいカタログに含まれる全集計オファーにカタログを追加
+                            yield repos.aggregateOffer.pushIncludedInDataCatalog({
+                                project: { id: params.project.id },
+                                id: { $in: aggregateOfferIds },
+                                $push: {
+                                    includedInDataCatalog: { $each: [{ id: offerCatalogId }] }
+                                }
+                            });
+                        }
+                        // 同期済記録を補完
+                        yield repos.offerCatalog.updateDateSynced({ id: offerCatalogId, dateSynced: new Date() });
+                        break;
+                    default:
+                    // no op
+                }
+            }
+        }
+    });
+}
+exports.syncOfferCatalog = syncOfferCatalog;

package/lib/chevre/service/task/onResourceUpdated.js

@@ -13,6 +13,7 @@ exports.call = void 0;
 const factory = require("../../factory");
 const accountTitle_1 = require("../../repo/accountTitle");
 const action_1 = require("../../repo/action");
+const aggregateOffer_1 = require("../../repo/aggregateOffer");
 const categoryCode_1 = require("../../repo/categoryCode");
 const creativeWork_1 = require("../../repo/creativeWork");
 const event_1 = require("../../repo/event");
@@ -25,6 +26,7 @@ const product_1 = require("../../repo/product");
 const productOffer_1 = require("../../repo/productOffer");
 const task_1 = require("../../repo/task");
 const onResourceDeleted_1 = require("./onResourceUpdated/onResourceDeleted");
+const syncOfferCatalog_1 = require("./onResourceUpdated/syncOfferCatalog");
 const settings_1 = require("../../settings");
 const informResources = settings_1.settings.onResourceUpdated.informResource;
 /**
@@ -35,6 +37,7 @@ function call(data) {
         yield onResourceUpdated(data)({
             accountTitle: new accountTitle_1.MongoRepository(connectionSettings.connection),
             action: new action_1.MongoRepository(connectionSettings.connection),
+            aggregateOffer: new aggregateOffer_1.MongoRepository(connectionSettings.connection),
             categoryCode: new categoryCode_1.MongoRepository(connectionSettings.connection),
             creativeWork: new creativeWork_1.MongoRepository(connectionSettings.connection),
             event: new event_1.MongoRepository(connectionSettings.connection),
@@ -107,6 +110,15 @@ function onResourceUpdated(params) {
                         typeOf: params.typeOf
                     })(repos);
                     break;
+                // カタログに対応(2023-09-12~)
+                case 'OfferCatalog':
+                    yield (0, syncOfferCatalog_1.syncOfferCatalog)({
+                        project: { id: params.project.id },
+                        ids: params.id,
+                        typeOf: params.typeOf,
+                        isDeleted: false
+                    })(repos);
+                    break;
                 default:
                 // no op
             }

package/lib/chevre/service/task/returnPayTransaction.js

@@ -159,7 +159,11 @@ function transaction2refundFee(params) {
     return refundFee;
 }
 function createStartRefundTransactionParams(params) {
-    var _a;
+    var _a, _b;
+    const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
+    if (typeof paymentMethodType !== 'string') {
+        throw new factory.errors.NotFound('object.paymentMethod.identifier');
+    }
     return {
         project: { id: params.project.id, typeOf: factory.organizationType.Project },
         typeOf: factory.assetTransactionType.Refund,
@@ -173,11 +177,12 @@ function createStartRefundTransactionParams(params) {
         recipient: { typeOf: params.recipient.typeOf, name: params.recipient.name },
         object: {
             typeOf: params.paymentServiceType,
-            id: (typeof ((_a = params.object.issuedThrough) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? params.object.issuedThrough.id : '',
+            id: (typeof ((_b = params.object.issuedThrough) === null || _b === void 0 ? void 0 : _b.id) === 'string') ? params.object.issuedThrough.id : '',
             paymentMethod: {
                 additionalProperty: params.object.additionalProperty,
                 name: params.object.name,
-                typeOf: params.object.typeOf,
+                // typeOf: params.object.typeOf,
+                typeOf: paymentMethodType,
                 paymentMethodId: params.object.paymentMethodId
             },
             refundFee: params.refundFee

package/lib/chevre/service/transaction/placeOrderInProgress/result.js

@@ -65,35 +65,51 @@ function createPaymentMethods(params) {
     const authorizePaymentActions = params.authorizeActions
         .filter((a) => {
         var _a;
+        const resultAsInvoice = (Array.isArray(a.result))
+            ? (_a = a.result) === null || _a === void 0 ? void 0 : _a.find((resultObject) => resultObject.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+            : a.result;
         return a.actionStatus === factory.actionStatusType.CompletedActionStatus
-            && ((_a = a.result) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment;
+            && (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment;
     });
     // 決済方法をセット
     authorizePaymentActions.forEach((a) => {
-        var _a, _b, _c;
-        const result = a.result;
-        const paymentMethodAmountCurrencyByAuthorizeAction = (_b = (_a = result.paymentMethodAsObject) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency;
-        const paymentMethodOfInvoice = (typeof paymentMethodAmountCurrencyByAuthorizeAction === 'string') ?
-            { amount: { currency: paymentMethodAmountCurrencyByAuthorizeAction } }
-            : undefined;
+        var _a, _b, _c, _d;
+        // const result = (<factory.action.authorize.paymentMethod.any.IResult>a.result);
+        const resultAsInvoice = (Array.isArray(a.result))
+            ? (_a = a.result) === null || _a === void 0 ? void 0 : _a.find((resultObject) => resultObject.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+            : a.result;
+        const paymentMethodAmountCurrencyByAuthorizeAction = (_c = (_b = resultAsInvoice.paymentMethodAsObject) === null || _b === void 0 ? void 0 : _b.amount) === null || _c === void 0 ? void 0 : _c.currency;
         // 決済方法区分は必ず存在するはず(2023-08-15~)
-        const paymentMethodType = (_c = result.paymentMethodAsObject) === null || _c === void 0 ? void 0 : _c.typeOf;
+        const paymentMethodType = (_d = resultAsInvoice.paymentMethodAsObject) === null || _d === void 0 ? void 0 : _d.typeOf;
         if (typeof paymentMethodType !== 'string') {
             throw new factory.errors.NotFound('authorizePaymentAction.result.paymentMethodAsObject.typeOf');
         }
-        paymentMethods.push(Object.assign({ accountId: result.accountId, additionalProperty: (Array.isArray(result.additionalProperty)) ? result.additionalProperty : [], issuedThrough: result.issuedThrough, name: result.name, paymentMethodId: result.paymentMethodId, paymentStatus: result.paymentStatus, totalPaymentDue: result.totalPaymentDue, typeOf: paymentMethodType }, (paymentMethodOfInvoice !== undefined) ? { paymentMethod: paymentMethodOfInvoice } : undefined));
+        const paymentMethodOfInvoice = Object.assign({ identifier: paymentMethodType }, (typeof paymentMethodAmountCurrencyByAuthorizeAction === 'string') ?
+            { amount: { currency: paymentMethodAmountCurrencyByAuthorizeAction } }
+            : undefined);
+        paymentMethods.push({
+            accountId: resultAsInvoice.accountId,
+            additionalProperty: (Array.isArray(resultAsInvoice.additionalProperty)) ? resultAsInvoice.additionalProperty : [],
+            issuedThrough: resultAsInvoice.issuedThrough,
+            name: resultAsInvoice.name,
+            paymentMethodId: resultAsInvoice.paymentMethodId,
+            paymentStatus: resultAsInvoice.paymentStatus,
+            totalPaymentDue: resultAsInvoice.totalPaymentDue,
+            typeOf: paymentMethodType,
+            // CreditCardIFのカード通貨区分を追加(2023-08-15~)
+            // 決済方法区分を保証(2023-08-28~)
+            paymentMethod: paymentMethodOfInvoice
+        });
     });
     // 決済方法から注文金額の計算
-    // price += authorizePaymentActions
-    //     .filter((a) => {
-    //         return a.result?.totalPaymentDue?.currency === factory.priceCurrency.JPY;
-    //     })
-    //     .reduce((a, b) => a + (<IAuthorizeAnyPaymentResult>b.result).amount, 0);
     price += authorizePaymentActions
         .reduce((a, b) => {
         var _a, _b;
-        const jpyAmount = (((_b = (_a = b.result) === null || _a === void 0 ? void 0 : _a.totalPaymentDue) === null || _b === void 0 ? void 0 : _b.currency) === factory.priceCurrency.JPY)
-            ? b.result.totalPaymentDue.value
+        const resultAsInvoice = (Array.isArray(b.result))
+            ? (_a = b.result) === null || _a === void 0 ? void 0 : _a.find((resultObject) => resultObject.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+            : b.result;
+        const jpyAmount = (((_b = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.totalPaymentDue) === null || _b === void 0 ? void 0 : _b.currency) === factory.priceCurrency.JPY)
+            ? resultAsInvoice.totalPaymentDue.value
             : 0;
         return a + jpyAmount;
     }, 0);