@chevre/domain 21.8.0-alpha.4 → 21.8.0-alpha.41

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

@@ -34,9 +34,9 @@ function authorize(params, paymentServiceId, searchTrade4accountId) {
             exclusion: []
         });
         // CreditCard系統の決済方法タイプは動的
-        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 availableChannel = yield repos.product.findAvailableChannel({
             project: params.project,
@@ -205,16 +205,16 @@ function handleAuthorizeError(error) {
  */
 function voidTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         const transaction = params.object;
         // CreditCard系統の決済方法タイプは動的
-        const paymentMethodType = (_a = transaction.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.typeOf;
+        const paymentMethodType = (_a = transaction.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 paymentMethodId = (_b = transaction.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.paymentMethodId;
+        const paymentMethodId = transaction.object.paymentMethodId;
         if (typeof paymentMethodId !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.paymentMethodId');
+            throw new factory.errors.ArgumentNull('object.paymentMethodId');
         }
         const paymentServiceId = String(transaction.object.id);
         const availableChannel = yield repos.product.findAvailableChannel({
@@ -222,7 +222,7 @@ function voidTransaction(params) {
             typeOf: factory.service.paymentService.PaymentServiceType.CreditCard,
             id: paymentServiceId
         });
-        const sellerId = (_c = transaction.recipient) === null || _c === void 0 ? void 0 : _c.id;
+        const sellerId = (_b = transaction.recipient) === null || _b === void 0 ? void 0 : _b.id;
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('object.recipient.id');
         }
@@ -236,8 +236,8 @@ function voidTransaction(params) {
                 shopId: shopId,
                 shopPass: shopPass,
                 orderId: paymentMethodId,
-                siteId: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.siteId,
-                sitePass: (_e = availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.sitePass
+                siteId: (_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.siteId,
+                sitePass: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
             });
             debug('searchTradeResult:', searchTradeResult);
             // 仮売上であれば取消
@@ -248,8 +248,8 @@ function voidTransaction(params) {
                     accessId: searchTradeResult.accessId,
                     accessPass: searchTradeResult.accessPass,
                     jobCd: GMO.utils.util.JobCd.Void,
-                    siteId: (_f = availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.siteId,
-                    sitePass: (_g = availableChannel.credentials) === null || _g === void 0 ? void 0 : _g.sitePass
+                    siteId: (_e = availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.siteId,
+                    sitePass: (_f = availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.sitePass
                 });
                 debug('alterTran processed', alterTranResult);
             }

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

@@ -39,9 +39,9 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
             throw new factory.errors.Argument('movieTickets', 'Number of movie ticket accessCodes must be 1');
         }
         // ムビチケ系統の決済方法タイプは動的
-        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');
         }
         // イベント取得属性最適化(2023-01-23~)
         const screeningEvent = yield repos.event.findMinimizedIndividualEventById({

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

@@ -122,11 +122,9 @@ function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBef
             const validateMovieTicketResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet)(repos);
             accountsReceivablesByServiceType = validateMovieTicketResult.accountsReceivablesByServiceType;
             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;
             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) {
@@ -157,15 +155,16 @@ function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBef
 exports.authorize = authorize;
 function voidTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const transaction = params.object;
-        const paymentMethodType = (_a = transaction.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.typeOf;
+        const paymentMethodType = (_a = transaction.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 paymentMethodId = (_b = transaction.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.paymentMethodId;
+        // const paymentMethodId = transaction.object.paymentMethod?.paymentMethodId;
+        const paymentMethodId = transaction.object.paymentMethodId;
         if (typeof paymentMethodId !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.paymentMethodId');
+            throw new factory.errors.ArgumentNull('object.paymentMethodId');
         }
         // 決済開始時に着券していれば、取消
         // 例えばtimeoutが原因でCompletedActionStatusでない場合、外部サービス側では着券済の可能性もあるので、そこを考慮する
@@ -192,14 +191,14 @@ function voidTransaction(params) {
                         paymentMethod: {
                             paymentMethodId: paymentMethodId,
                             typeOf: paymentMethodType,
-                            name: (typeof ((_c = transaction.object.paymentMethod) === null || _c === void 0 ? void 0 : _c.name) === 'string')
+                            name: (typeof ((_b = transaction.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.name) === 'string')
                                 ? transaction.object.paymentMethod.name
                                 : paymentMethodType,
                             additionalProperty: []
                         }
                     }], agent: {
                     id: seller.id,
-                    name: (typeof seller.name === 'string') ? seller.name : String((_d = seller.name) === null || _d === void 0 ? void 0 : _d.ja),
+                    name: (typeof seller.name === 'string') ? seller.name : String((_c = seller.name) === null || _c === void 0 ? void 0 : _c.ja),
                     typeOf: seller.typeOf
                 }, recipient: transaction.recipient }, ((payAction === null || payAction === void 0 ? void 0 : payAction.purpose) !== undefined)
                 ? { purpose: payAction.purpose }

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

@@ -68,7 +68,7 @@ function validatePaymentMethod(params, paymentServiceId) {
         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;
+        const paymentMethodType = (_c = params.object.paymentMethod) === null || _c === void 0 ? void 0 : _c.identifier;
         if (typeof serviceOutputIdentifier !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.accountId');
         }
@@ -76,7 +76,7 @@ function validatePaymentMethod(params, paymentServiceId) {
             throw new factory.errors.ArgumentNull('object.paymentMethod.amount');
         }
         if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
+            throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         // プロダクトから通貨区分を取得
         const paymentCatdProduct = yield repos.product.findById({ id: paymentServiceId }, ['serviceOutput'], []);
@@ -182,15 +182,12 @@ function processAccountTransaction(params) {
 }
 function voidTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c;
         const transaction = params.object;
-        const paymentMethodType = (_a = transaction.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.typeOf;
-        const paymentMethodId = (_b = transaction.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.paymentMethodId;
-        if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
-        }
+        // const paymentMethodId = transaction.object.paymentMethod?.paymentMethodId;
+        const paymentMethodId = transaction.object.paymentMethodId;
         if (typeof paymentMethodId !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.paymentMethodId');
+            throw new factory.errors.ArgumentNull('object.paymentMethodId');
         }
         const paymentServiceId = String(transaction.object.id);
         // アクションステータスに関係なく取消処理実行
@@ -204,9 +201,9 @@ function voidTransaction(params) {
         const accountTransactionService = new pecorinoapi.service.AccountTransaction({
             endpoint: String(availableChannel.serviceUrl),
             auth: new pecorinoapi.auth.ClientCredentials({
-                domain: String((_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.authorizeServerDomain),
-                clientId: String((_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.clientId),
-                clientSecret: String((_e = availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.clientSecret),
+                domain: String((_a = availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.authorizeServerDomain),
+                clientId: String((_b = availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.clientId),
+                clientSecret: String((_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.clientSecret),
                 scopes: [],
                 state: ''
             })

package/lib/chevre/service/project.js

@@ -27,7 +27,7 @@ function cleanUpDatabaseByProject(params) {
         yield repos.categoryCode.deleteByProject({ project: { id: params.id } });
         yield repos.creativeWork.deleteByProject({ project: { id: params.id } });
         yield repos.event.deleteByProject({ project: { id: params.id } });
-        yield repos.offer.deleteByProject({ project: { id: params.id } });
+        // await repos.offer.deleteByProject({ project: { id: params.id } });
         yield repos.offerCatalog.deleteByProject({ project: { id: params.id } });
         yield repos.place.deleteByProject({ project: { id: params.id } });
         yield repos.priceSpecification.deleteByProject({ project: { id: params.id } });

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");
@@ -41,9 +40,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,

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);

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,

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/onOrderPaymentCompleted.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.OnOrderPaymentCompleted>): IOperation<void>;

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

@@ -0,0 +1,35 @@
+"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 order_1 = require("../../repo/order");
+const task_1 = require("../../repo/task");
+const transaction_1 = require("../../repo/transaction");
+const payOrder_1 = require("../order/payOrder");
+/**
+ * タスク実行関数
+ */
+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, payOrder_1.payOrder)(data)({
+            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/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/task/syncAggregateOffer.d.ts

@@ -0,0 +1,7 @@
+import * as factory from '../../factory';
+import { IConnectionSettings } from '../task';
+export type IOperation<T> = (settings: IConnectionSettings) => Promise<T>;
+/**
+ * タスク実行関数
+ */
+export declare function call(data: factory.task.syncAggregateOffer.IData): IOperation<void>;

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

@@ -0,0 +1,23 @@
+"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 offer_1 = require("../../repo/offer");
+/**
+ * タスク実行関数
+ */
+function call(data) {
+    return (connectionSettings) => __awaiter(this, void 0, void 0, function* () {
+        const offerRepo = new offer_1.MongoRepository(connectionSettings.connection);
+        yield offerRepo.sync2aggregateOffer(data);
+    });
+}
+exports.call = call;

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);

package/lib/chevre/service/transaction/placeOrderInProgress/validation/validateMovieTicket.js

@@ -12,15 +12,17 @@ const debug = createDebug('cinerino-domain:service:validateMovieTicket');
  */
 function validateMovieTicket(paymentMethodType, transaction, authorizeActions) {
     const authorizeMovieTicketActions = authorizeActions.filter((a) => {
-        var _a, _b, _c, _d;
+        var _a, _b;
+        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
-            && ((_b = a.result) === null || _b === void 0 ? void 0 : _b.issuedThrough.typeOf) === factory.service.paymentService.PaymentServiceType.MovieTicket
+            && (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment
+            && (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.issuedThrough.typeOf) === factory.service.paymentService.PaymentServiceType.MovieTicket
             // 決済方法区分は必ず存在するはず(2023-08-15~)
-            && ((_d = (_c = a.result) === null || _c === void 0 ? void 0 : _c.paymentMethodAsObject) === null || _d === void 0 ? void 0 : _d.typeOf) === paymentMethodType;
-    }
-    // && a.result?.paymentMethod === paymentMethodType
-    );
+            && ((_b = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.paymentMethodAsObject) === null || _b === void 0 ? void 0 : _b.typeOf) === paymentMethodType;
+        // && a.result?.paymentMethod === paymentMethodType
+    });
     const seatReservationAuthorizeActions = authorizeActions.filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus
         && a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);
     // 予約によって必要とされるMovieTicket
@@ -149,10 +151,10 @@ function authorizeSeatReservationActions2requiredMovieTickets(params) {
                         appliesToMovieTickets4paymentMethod = appliesToMovieTickets4reservation.filter((a) => {
                             return a.serviceOutput.typeOf === paymentMethodType;
                         });
-                    }
-                    else if (typeof (appliesToMovieTickets4reservation === null || appliesToMovieTickets4reservation === void 0 ? void 0 : appliesToMovieTickets4reservation.identifier) === 'string') {
-                        // Arrayでない場合を廃止(2022-08-01~)
-                        throw new factory.errors.NotImplemented('appliesToMovieTickets.typeOf as string not implemented');
+                        // Array以外への考慮自体を廃止(2023-09-01~)
+                        // } else if (typeof appliesToMovieTickets4reservation?.identifier === 'string') {
+                        //     // Arrayでない場合を廃止(2022-08-01~)
+                        //     throw new factory.errors.NotImplemented('appliesToMovieTickets.typeOf as string not implemented');
                     }
                     if (Array.isArray(appliesToMovieTickets4paymentMethod) && appliesToMovieTickets4paymentMethod.length > 0) {
                         appliesToMovieTickets4paymentMethod.forEach((appliesToMovieTicket) => {