@chevre/domain 21.7.0 → 21.8.0-alpha.1

package/lib/chevre/emailMessageBuilder.js

@@ -115,7 +115,8 @@ function createEmailMessageSender(params) {
             : (typeof params.order.seller.name === 'string')
                 ? params.order.seller.name
                 : String(params.order.seller.id),
-        email: (typeof ((_d = (_c = params.email) === null || _c === void 0 ? void 0 : _c.sender) === null || _d === void 0 ? void 0 : _d.email) === 'string')
+        // sender.email指定を非推奨化(2023-08-23~)
+        email: (settings_1.USE_CUSTOM_SENDER_EMAIL && typeof ((_d = (_c = params.email) === null || _c === void 0 ? void 0 : _c.sender) === null || _d === void 0 ? void 0 : _d.email) === 'string')
             ? params.email.sender.email
             : settings_1.DEFAULT_SENDER_EMAIL
     };

package/lib/chevre/repo/assetTransaction.js

@@ -24,7 +24,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(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, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24;
+        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, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25;
         const andConditions = [
             {
                 typeOf: params.typeOf
@@ -97,12 +97,11 @@ class MongoRepository {
         }
         const transactionNumberEq = (_c = params.transactionNumber) === null || _c === void 0 ? void 0 : _c.$eq;
         if (typeof transactionNumberEq === 'string') {
-            andConditions.push({
-                transactionNumber: {
-                    $exists: true,
-                    $eq: transactionNumberEq
-                }
-            });
+            andConditions.push({ transactionNumber: { $exists: true, $eq: transactionNumberEq } });
+        }
+        const transactionNumberIn = (_d = params.transactionNumber) === null || _d === void 0 ? void 0 : _d.$in;
+        if (Array.isArray(transactionNumberIn)) {
+            andConditions.push({ transactionNumber: { $exists: true, $in: transactionNumberIn } });
         }
         if (Array.isArray(params.tasksExportationStatuses)) {
             andConditions.push({
@@ -111,7 +110,7 @@ class MongoRepository {
         }
         switch (params.typeOf) {
             case factory.assetTransactionType.Pay:
-                const objectAccountIdEq = (_e = (_d = params.object) === null || _d === void 0 ? void 0 : _d.accountId) === null || _e === void 0 ? void 0 : _e.$eq;
+                const objectAccountIdEq = (_f = (_e = params.object) === null || _e === void 0 ? void 0 : _e.accountId) === null || _f === void 0 ? void 0 : _f.$eq;
                 if (typeof objectAccountIdEq === 'string') {
                     andConditions.push({
                         'object.accountId': {
@@ -122,7 +121,7 @@ class MongoRepository {
                 }
                 break;
             case factory.assetTransactionType.Refund:
-                const objectAccountIdEq4refund = (_g = (_f = params.object) === null || _f === void 0 ? void 0 : _f.accountId) === null || _g === void 0 ? void 0 : _g.$eq;
+                const objectAccountIdEq4refund = (_h = (_g = params.object) === null || _g === void 0 ? void 0 : _g.accountId) === null || _h === void 0 ? void 0 : _h.$eq;
                 if (typeof objectAccountIdEq4refund === 'string') {
                     andConditions.push({
                         'object.accountId': {
@@ -131,13 +130,13 @@ class MongoRepository {
                         }
                     });
                 }
-                const objectPaymentMethodIdEq4refund = (_j = (_h = params.object) === null || _h === void 0 ? void 0 : _h.paymentMethodId) === null || _j === void 0 ? void 0 : _j.$eq;
+                const objectPaymentMethodIdEq4refund = (_k = (_j = params.object) === null || _j === void 0 ? void 0 : _j.paymentMethodId) === null || _k === void 0 ? void 0 : _k.$eq;
                 if (typeof objectPaymentMethodIdEq4refund === 'string') {
                     andConditions.push({
                         'object.paymentMethodId': { $exists: true, $eq: objectPaymentMethodIdEq4refund }
                     });
                 }
-                const objectPaymentMethodIdIn4refund = (_l = (_k = params.object) === null || _k === void 0 ? void 0 : _k.paymentMethodId) === null || _l === void 0 ? void 0 : _l.$in;
+                const objectPaymentMethodIdIn4refund = (_m = (_l = params.object) === null || _l === void 0 ? void 0 : _l.paymentMethodId) === null || _m === void 0 ? void 0 : _m.$in;
                 if (Array.isArray(objectPaymentMethodIdIn4refund)) {
                     andConditions.push({
                         'object.paymentMethodId': { $exists: true, $in: objectPaymentMethodIdIn4refund }
@@ -145,7 +144,7 @@ class MongoRepository {
                 }
                 break;
             case factory.assetTransactionType.MoneyTransfer:
-                const fromLocationIdentifierEq = (_p = (_o = (_m = params.object) === null || _m === void 0 ? void 0 : _m.fromLocation) === null || _o === void 0 ? void 0 : _o.identifier) === null || _p === void 0 ? void 0 : _p.$eq;
+                const fromLocationIdentifierEq = (_q = (_p = (_o = params.object) === null || _o === void 0 ? void 0 : _o.fromLocation) === null || _p === void 0 ? void 0 : _p.identifier) === null || _q === void 0 ? void 0 : _q.$eq;
                 if (typeof fromLocationIdentifierEq === 'string') {
                     andConditions.push({
                         'object.fromLocation.identifier': {
@@ -154,7 +153,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const toLocationIdentifierEq = (_s = (_r = (_q = params.object) === null || _q === void 0 ? void 0 : _q.toLocation) === null || _r === void 0 ? void 0 : _r.identifier) === null || _s === void 0 ? void 0 : _s.$eq;
+                const toLocationIdentifierEq = (_t = (_s = (_r = params.object) === null || _r === void 0 ? void 0 : _r.toLocation) === null || _s === void 0 ? void 0 : _s.identifier) === null || _t === void 0 ? void 0 : _t.$eq;
                 if (typeof toLocationIdentifierEq === 'string') {
                     andConditions.push({
                         'object.toLocation.identifier': {
@@ -163,7 +162,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const pendingTransactionIdentifierEq = (_v = (_u = (_t = params.object) === null || _t === void 0 ? void 0 : _t.pendingTransaction) === null || _u === void 0 ? void 0 : _u.identifier) === null || _v === void 0 ? void 0 : _v.$eq;
+                const pendingTransactionIdentifierEq = (_w = (_v = (_u = params.object) === null || _u === void 0 ? void 0 : _u.pendingTransaction) === null || _v === void 0 ? void 0 : _v.identifier) === null || _w === void 0 ? void 0 : _w.$eq;
                 if (typeof pendingTransactionIdentifierEq === 'string') {
                     andConditions.push({
                         'object.pendingTransaction.identifier': {
@@ -176,11 +175,11 @@ class MongoRepository {
             case factory.assetTransactionType.CancelReservation:
                 break;
             case factory.assetTransactionType.Reserve:
-                const objectProviderIdEq = (_y = (_x = (_w = params.object) === null || _w === void 0 ? void 0 : _w.provider) === null || _x === void 0 ? void 0 : _x.id) === null || _y === void 0 ? void 0 : _y.$eq;
+                const objectProviderIdEq = (_z = (_y = (_x = params.object) === null || _x === void 0 ? void 0 : _x.provider) === null || _y === void 0 ? void 0 : _y.id) === null || _z === void 0 ? void 0 : _z.$eq;
                 if (typeof objectProviderIdEq === 'string') {
                     andConditions.push({ 'object.provider.id': { $exists: true, $eq: objectProviderIdEq } });
                 }
-                const objectReservationForIdEq = (_1 = (_0 = (_z = params.object) === null || _z === void 0 ? void 0 : _z.reservationFor) === null || _0 === void 0 ? void 0 : _0.id) === null || _1 === void 0 ? void 0 : _1.$eq;
+                const objectReservationForIdEq = (_2 = (_1 = (_0 = params.object) === null || _0 === void 0 ? void 0 : _0.reservationFor) === null || _1 === void 0 ? void 0 : _1.id) === null || _2 === void 0 ? void 0 : _2.$eq;
                 if (typeof objectReservationForIdEq === 'string') {
                     andConditions.push({
                         'object.reservationFor.id': {
@@ -189,7 +188,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const objectReservationNumberIn = (_3 = (_2 = params.object) === null || _2 === void 0 ? void 0 : _2.reservationNumber) === null || _3 === void 0 ? void 0 : _3.$in;
+                const objectReservationNumberIn = (_4 = (_3 = params.object) === null || _3 === void 0 ? void 0 : _3.reservationNumber) === null || _4 === void 0 ? void 0 : _4.$in;
                 if (Array.isArray(objectReservationNumberIn)) {
                     andConditions.push({
                         'object.reservationNumber': {
@@ -198,7 +197,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const objectReservationNumberEq = (_5 = (_4 = params.object) === null || _4 === void 0 ? void 0 : _4.reservationNumber) === null || _5 === void 0 ? void 0 : _5.$eq;
+                const objectReservationNumberEq = (_6 = (_5 = params.object) === null || _5 === void 0 ? void 0 : _5.reservationNumber) === null || _6 === void 0 ? void 0 : _6.$eq;
                 if (typeof objectReservationNumberEq === 'string') {
                     andConditions.push({
                         'object.reservationNumber': {
@@ -207,7 +206,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const objectSubReservationIdIn = (_8 = (_7 = (_6 = params.object) === null || _6 === void 0 ? void 0 : _6.reservations) === null || _7 === void 0 ? void 0 : _7.id) === null || _8 === void 0 ? void 0 : _8.$in;
+                const objectSubReservationIdIn = (_9 = (_8 = (_7 = params.object) === null || _7 === void 0 ? void 0 : _7.reservations) === null || _8 === void 0 ? void 0 : _8.id) === null || _9 === void 0 ? void 0 : _9.$in;
                 if (Array.isArray(objectSubReservationIdIn)) {
                     andConditions.push({
                         'object.subReservation.id': {
@@ -242,7 +241,7 @@ class MongoRepository {
                         }
                     }
                 }
-                const objectUnderNameIdEq = (_11 = (_10 = (_9 = params.object) === null || _9 === void 0 ? void 0 : _9.underName) === null || _10 === void 0 ? void 0 : _10.id) === null || _11 === void 0 ? void 0 : _11.$eq;
+                const objectUnderNameIdEq = (_12 = (_11 = (_10 = params.object) === null || _10 === void 0 ? void 0 : _10.underName) === null || _11 === void 0 ? void 0 : _11.id) === null || _12 === void 0 ? void 0 : _12.$eq;
                 if (typeof objectUnderNameIdEq === 'string') {
                     andConditions.push({
                         'object.underName.id': {
@@ -251,7 +250,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const objectSubReservationSeatNumberEq = (_16 = (_15 = (_14 = (_13 = (_12 = params.object) === null || _12 === void 0 ? void 0 : _12.reservations) === null || _13 === void 0 ? void 0 : _13.reservedTicket) === null || _14 === void 0 ? void 0 : _14.ticketedSeat) === null || _15 === void 0 ? void 0 : _15.seatNumber) === null || _16 === void 0 ? void 0 : _16.$eq;
+                const objectSubReservationSeatNumberEq = (_17 = (_16 = (_15 = (_14 = (_13 = params.object) === null || _13 === void 0 ? void 0 : _13.reservations) === null || _14 === void 0 ? void 0 : _14.reservedTicket) === null || _15 === void 0 ? void 0 : _15.ticketedSeat) === null || _16 === void 0 ? void 0 : _16.seatNumber) === null || _17 === void 0 ? void 0 : _17.$eq;
                 if (typeof objectSubReservationSeatNumberEq === 'string') {
                     andConditions.push({
                         'object.subReservation.reservedTicket.ticketedSeat.seatNumber': {
@@ -262,7 +261,7 @@ class MongoRepository {
                 }
                 break;
             case factory.assetTransactionType.RegisterService:
-                const objectItemOfferedServiceOutputIdentifierEq = (_20 = (_19 = (_18 = (_17 = params.object) === null || _17 === void 0 ? void 0 : _17.itemOffered) === null || _18 === void 0 ? void 0 : _18.serviceOutput) === null || _19 === void 0 ? void 0 : _19.identifier) === null || _20 === void 0 ? void 0 : _20.$eq;
+                const objectItemOfferedServiceOutputIdentifierEq = (_21 = (_20 = (_19 = (_18 = params.object) === null || _18 === void 0 ? void 0 : _18.itemOffered) === null || _19 === void 0 ? void 0 : _19.serviceOutput) === null || _20 === void 0 ? void 0 : _20.identifier) === null || _21 === void 0 ? void 0 : _21.$eq;
                 if (typeof objectItemOfferedServiceOutputIdentifierEq === 'string') {
                     andConditions.push({
                         'object.itemOffered.serviceOutput.identifier': {
@@ -271,7 +270,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const objectItemOfferedServiceOutputIdentifierIn = (_24 = (_23 = (_22 = (_21 = params.object) === null || _21 === void 0 ? void 0 : _21.itemOffered) === null || _22 === void 0 ? void 0 : _22.serviceOutput) === null || _23 === void 0 ? void 0 : _23.identifier) === null || _24 === void 0 ? void 0 : _24.$in;
+                const objectItemOfferedServiceOutputIdentifierIn = (_25 = (_24 = (_23 = (_22 = params.object) === null || _22 === void 0 ? void 0 : _22.itemOffered) === null || _23 === void 0 ? void 0 : _23.serviceOutput) === null || _24 === void 0 ? void 0 : _24.identifier) === null || _25 === void 0 ? void 0 : _25.$in;
                 if (Array.isArray(objectItemOfferedServiceOutputIdentifierIn)) {
                     andConditions.push({
                         'object.itemOffered.serviceOutput.identifier': {

package/lib/chevre/service/order/onOrderStatusChanged.js

@@ -22,6 +22,7 @@ const factory_1 = require("./onOrderStatusChanged/factory");
 const USE_CONFIRM_REGISTER_SERVICE_TRANSACTION = process.env.USE_CONFIRM_REGISTER_SERVICE_TRANSACTION === '1';
 const TOKEN_EXPIRES_IN = 604800;
 function onOrderStatusChanged(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         let tasks = [];
@@ -76,6 +77,12 @@ function onOrderStatusChanged(params) {
                     throw error;
                 }
                 break;
+            // OrderPaymentDueを追加(2023-08-23~)
+            case factory.orderStatus.OrderPaymentDue:
+                tasks = [
+                    ...yield createConfirmPayTransactionTasks(params.order, simpleOrder)(repos)
+                ];
+                break;
             case factory.orderStatus.OrderProcessing:
                 const orderWithToken = yield (0, factory_1.getOrderWithToken)({ order: params.order, expiresIn: TOKEN_EXPIRES_IN });
                 tasks = [
@@ -116,7 +123,13 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
         const taskRunsAt = moment(order.orderDate)
             .toDate();
         const tasks = [];
-        yield Promise.all(order.paymentMethods.map((paymentMethod) => __awaiter(this, void 0, void 0, function* () {
+        yield Promise.all(order.paymentMethods.map((invoice) => __awaiter(this, void 0, void 0, function* () {
+            // tslint:disable-next-line:no-suspicious-comment
+            // TODO 注文にpaymentStatusを保証した後に実装する
+            // PaymentAutomaticallyAppliedであれば、自動決済処理を実行
+            // if (invoice.paymentStatus !== factory.paymentStatusType.PaymentAutomaticallyApplied) {
+            //     return;
+            // }
             // 冗長なタスク作成を回避
             const existingTasks = yield repos.task.search({
                 limit: 1,
@@ -124,7 +137,7 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
                 project: { id: { $eq: order.project.id } },
                 name: factory.taskName.ConfirmPayTransaction,
                 data: {
-                    object: { transactionNumber: { $eq: paymentMethod.paymentMethodId } },
+                    object: { transactionNumber: { $eq: invoice.paymentMethodId } },
                     purpose: { orderNumber: { $eq: order.orderNumber } }
                 }
             }, {
@@ -135,13 +148,15 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
                 const data = {
                     project: order.project,
                     typeOf: factory.actionType.ConfirmAction,
-                    object: [{ typeOf: factory.assetTransactionType.Pay, transactionNumber: paymentMethod.paymentMethodId }],
+                    object: [{ typeOf: factory.assetTransactionType.Pay, transactionNumber: invoice.paymentMethodId }],
                     agent: order.project,
                     purpose: Object.assign(Object.assign({}, simpleOrder), { confirmationNumber: order.confirmationNumber }),
                     instrument: {
                         typeOf: 'WebAPI',
                         identifier: factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre
-                    }
+                    },
+                    processOrder: order.orderStatus === factory.orderStatus.OrderPaymentDue,
+                    useOnOrderStatusChanged: true
                 };
                 tasks.push({
                     project: order.project,

package/lib/chevre/service/order/payOrder.d.ts

@@ -0,0 +1,23 @@
+import { RedisRepository as RegisterServiceInProgressRepo } from '../../repo/action/registerServiceInProgress';
+import { MongoRepository as OrderRepo } from '../../repo/order';
+import { MongoRepository as TaskRepo } from '../../repo/task';
+import { MongoRepository as TransactionRepo } from '../../repo/transaction';
+/**
+ * 注文を決済する
+ */
+declare function payOrder(params: {
+    project: {
+        id: string;
+    };
+    object: {
+        confirmationNumber: string;
+        orderNumber: string;
+    };
+    useOnOrderStatusChanged: boolean;
+}): (repos: {
+    order: OrderRepo;
+    registerActionInProgress: RegisterServiceInProgressRepo;
+    task: TaskRepo;
+    transaction: TransactionRepo;
+}) => Promise<void>;
+export { payOrder };

package/lib/chevre/service/order/payOrder.js

@@ -0,0 +1,74 @@
+"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.payOrder = void 0;
+const findPlaceOrderTransaction_1 = require("./findPlaceOrderTransaction");
+const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
+const factory = require("../../factory");
+/**
+ * 注文を決済する
+ */
+function payOrder(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        if (typeof params.useOnOrderStatusChanged !== 'boolean') {
+            throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
+        }
+        const orderNumber = params.object.orderNumber;
+        const confirmationNumber = params.object.confirmationNumber;
+        const placeOrderTransaction = yield (0, findPlaceOrderTransaction_1.findPlaceOrderTransaction)({
+            project: { id: params.project.id },
+            confirmationNumber,
+            orderNumber
+        })({ transaction: repos.transaction });
+        let order = yield repos.order.findByOrderNumber({
+            orderNumber,
+            project: { id: params.project.id },
+            inclusion: [],
+            exclusion: []
+        });
+        try {
+            order = yield repos.order.changeStatus({
+                project: { id: order.project.id },
+                orderNumber,
+                orderStatus: factory.orderStatus.OrderProcessing,
+                previousOrderStatus: factory.orderStatus.OrderPaymentDue
+            });
+        }
+        catch (error) {
+            let throwsError = true;
+            // すでにステータスが煤でいた場合、OrderPaymentDue->OrderProcessingの処理自体は成功しているので、後処理を続行する
+            order = yield repos.order.findByOrderNumber({
+                orderNumber: params.object.orderNumber,
+                project: { id: params.project.id },
+                inclusion: [],
+                exclusion: []
+            });
+            if (order.orderStatus === factory.orderStatus.OrderDelivered
+                || order.orderStatus === factory.orderStatus.OrderReturned) {
+                throwsError = false;
+            }
+            if (throwsError) {
+                throw error;
+            }
+        }
+        if (params.useOnOrderStatusChanged) {
+            yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({
+                order: Object.assign(Object.assign({}, order), { orderStatus: factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する
+                 }),
+                placeOrderTransaction
+            })({
+                registerActionInProgress: repos.registerActionInProgress,
+                task: repos.task
+            });
+        }
+    });
+}
+exports.payOrder = payOrder;

package/lib/chevre/service/order/placeOrder.js

@@ -15,6 +15,7 @@ const order_1 = require("../../factory/order");
 const createAccountingReportIfNotExist_1 = require("./createAccountingReportIfNotExist");
 const findPlaceOrderTransaction_1 = require("./findPlaceOrderTransaction");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
+const payOrder_1 = require("./payOrder");
 const factory = require("../../factory");
 function createOrder(params) {
     // 必要な属性についてDate型に変換(でないと検索クエリを効率的に使えない)
@@ -151,6 +152,7 @@ exports.placeOrderWithoutTransaction = placeOrderWithoutTransaction;
  */
 // tslint:disable-next-line:max-func-body-length
 function placeOrder(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
@@ -222,10 +224,24 @@ function placeOrder(params) {
         if (params.useOnOrderStatusChanged) {
             // 経理レポートを保管
             yield (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)(order)({ accountingReport: repos.accountingReport });
-            yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order, placeOrderTransaction })({
-                registerActionInProgress: repos.registerActionInProgress,
-                task: repos.task
-            });
+            // PaymentDueであればonOrderStatusChangedを実行(2023-08-23~)
+            if (order.orderStatus === factory.orderStatus.OrderPaymentDue) {
+                yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order, placeOrderTransaction })({
+                    registerActionInProgress: repos.registerActionInProgress,
+                    task: repos.task
+                });
+            }
+            else if (order.orderStatus === factory.orderStatus.OrderProcessing) {
+                // OrderPaymentDueをスキップしてOrderProcessingから開始する場合(2023-08-23~)
+                yield (0, payOrder_1.payOrder)({
+                    project: { id: order.project.id },
+                    object: {
+                        confirmationNumber: order.confirmationNumber,
+                        orderNumber: order.orderNumber
+                    },
+                    useOnOrderStatusChanged: params.useOnOrderStatusChanged
+                })(repos);
+            }
         }
         // onOrderStatusChangedへ移行(2023-08-17~)
         // await onPlaceOrder({

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

@@ -108,7 +108,7 @@ function createAuthorizeResult(params) {
         // 完全廃止(paymentMethodAsObjectへ完全移行)(2023-08-16~)
         // paymentMethod: params.object.paymentMethod,
         paymentMethodAsObject,
-        paymentStatus: factory.paymentStatusType.PaymentDue,
+        paymentStatus: factory.paymentStatusType.PaymentAutomaticallyApplied,
         paymentMethodId: (typeof ((_f = payTransactionObject.paymentMethod) === null || _f === void 0 ? void 0 : _f.paymentMethodId) === 'string')
             ? payTransactionObject.paymentMethod.paymentMethodId
             : '',

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

@@ -10,8 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 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");
@@ -19,12 +21,17 @@ const product_1 = require("../../repo/product");
 const project_1 = require("../../repo/project");
 const seller_1 = require("../../repo/seller");
 const task_1 = require("../../repo/task");
+const transaction_1 = require("../../repo/transaction");
 const PayTransactionService = require("../assetTransaction/pay");
+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');
+        }
         const actionRepo = new action_1.MongoRepository(settings.connection);
         const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
         const orderRepo = new order_1.MongoRepository(settings.connection);
@@ -34,6 +41,8 @@ function call(data) {
         const projectRepo = new project_1.MongoRepository(settings.connection);
         const sellerRepo = new seller_1.MongoRepository(settings.connection);
         const taskRepo = new task_1.MongoRepository(settings.connection);
+        const transactionRepo = new transaction_1.MongoRepository(settings.connection);
+        const registerServiceInProgressRepo = new registerServiceInProgress_1.RedisRepository(settings.redisClient);
         // アクション開始
         const action = yield actionRepo.start(data);
         try {
@@ -76,6 +85,53 @@ function call(data) {
         // アクション完了
         const actionResult = {};
         yield actionRepo.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        // processOrder連携(2023-08-23~)
+        yield onConfirmed(data)({
+            assetTransaction: assetTransactionRepo,
+            order: orderRepo,
+            registerActionInProgress: registerServiceInProgressRepo,
+            task: taskRepo,
+            transaction: transactionRepo
+        });
     });
 }
 exports.call = call;
+function onConfirmed(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        if (params.processOrder === true) {
+            // 注文のpaymentMethodIdを取得
+            const order = yield repos.order.findByOrderNumber({
+                orderNumber: params.purpose.orderNumber,
+                project: { id: params.project.id },
+                inclusion: ['paymentMethods'],
+                exclusion: []
+            });
+            // PayTransactionのステータス検証
+            let allPayTransactionConfirmed = false;
+            const paymentMethodIds = order.paymentMethods.filter((invoice) => typeof invoice.paymentMethodId === 'string' && invoice.paymentMethodId.length > 0)
+                .map((invoice) => invoice.paymentMethodId);
+            if (paymentMethodIds.length > 0) {
+                const referencedPayTransactions = yield repos.assetTransaction.search({
+                    project: { id: { $eq: params.project.id } },
+                    typeOf: factory.assetTransactionType.Pay,
+                    transactionNumber: { $in: paymentMethodIds }
+                }, ['status']);
+                allPayTransactionConfirmed =
+                    referencedPayTransactions.every((payTransation) => payTransation.status === factory.transactionStatusType.Confirmed);
+            }
+            else {
+                allPayTransactionConfirmed = true;
+            }
+            if (allPayTransactionConfirmed) {
+                yield (0, payOrder_1.payOrder)({
+                    project: { id: params.project.id },
+                    object: {
+                        confirmationNumber: params.purpose.confirmationNumber,
+                        orderNumber: params.purpose.orderNumber
+                    },
+                    useOnOrderStatusChanged: params.useOnOrderStatusChanged === true
+                })(repos);
+            }
+        }
+    });
+}

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

@@ -81,7 +81,7 @@ function createPaymentMethods(params) {
         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, totalPaymentDue: result.totalPaymentDue, typeOf: paymentMethodType }, (paymentMethodOfInvoice !== undefined) ? { paymentMethod: paymentMethodOfInvoice } : undefined));
+        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));
     });
     // 決済方法から注文金額の計算
     // price += authorizePaymentActions

package/lib/chevre/settings.d.ts

@@ -41,6 +41,7 @@ export declare const USE_NEW_EVENT_AVAILABILITY_KEY_FROM: moment.Moment;
 export declare const USE_ADVANCE_BOOKING_REQUIREMENT: boolean;
 export declare const USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT: boolean;
 export declare const USE_DELETE_EVENT_BY_ORDER: boolean;
+export declare const USE_CUSTOM_SENDER_EMAIL: boolean;
 export declare const INFORM_RESERVATION_TASK_DELAY_IN_SECONDS: number;
 export declare const MONGO_MAX_TIME_MS: number;
 /**

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.MONGO_MAX_TIME_MS = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = exports.USE_ADVANCE_BOOKING_REQUIREMENT = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.MONGO_MAX_TIME_MS = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_CUSTOM_SENDER_EMAIL = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = exports.USE_ADVANCE_BOOKING_REQUIREMENT = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -73,6 +73,7 @@ exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = (typeof process.env.USE_NEW_EVENT_
 exports.USE_ADVANCE_BOOKING_REQUIREMENT = process.env.USE_ADVANCE_BOOKING_REQUIREMENT === '1';
 exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = process.env.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT === '1';
 exports.USE_DELETE_EVENT_BY_ORDER = process.env.USE_DELETE_EVENT_BY_ORDER === '1';
+exports.USE_CUSTOM_SENDER_EMAIL = process.env.USE_CUSTOM_SENDER_EMAIL === '1';
 exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = (typeof process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS === 'string')
     ? Number(process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS)
     : 0;

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.326.0",
+    "@chevre/factory": "4.327.0-alpha.1",
     "@cinerino/sdk": "3.165.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.7.0"
+  "version": "21.8.0-alpha.1"
 }