@chevre/domain 20.2.0-alpha.8 → 20.2.0

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

@@ -28,7 +28,10 @@ exports.POINT_AWARD_IDENTIFIER_NAME = 'pointAwardIdentifiers';
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const seller = yield repos.seller.findById({ id: params.seller.id });
+        const seller = yield repos.seller.findById({ id: params.seller.id }, {
+            hasMerchantReturnPolicy: 0,
+            paymentAccepted: 0
+        });
         let makesOfferFromClient;
         // 販売者オファー検証(2022-10-14~)
         if (params.validateSeller === true) {
@@ -68,13 +71,13 @@ exports.start = start;
  */
 function confirm(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         // 確認番号を事前発行
         yield publishConfirmationNumberIfNotExist({
             id: params.id,
             object: { orderDate: params.result.order.orderDate }
         })(repos);
-        let transaction = yield repos.transaction.findById({
+        const transaction = yield repos.transaction.findById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.id
         });
@@ -95,10 +98,11 @@ function confirm(params) {
         transaction.object.authorizeActions = yield searchAuthorizeActions(params)(repos);
         // 注文番号を発行
         const orderNumber = yield publishOrderNumberIfNotExist({
+            project: { id: transaction.project.id },
             id: transaction.id,
             object: { orderDate: params.result.order.orderDate }
         })(repos);
-        const result = yield createResult(Object.assign(Object.assign({}, params), { orderNumber, transaction: transaction }))();
+        const result = createResult(Object.assign(Object.assign({}, params), { orderNumber, transaction: transaction }));
         // デフォルトEメールメッセージを検索
         let emailMessageOnOrderSent;
         if (repos.emailMessage !== undefined) {
@@ -115,13 +119,11 @@ function confirm(params) {
             order: result.order,
             potentialActions: params.potentialActions,
             transaction: transaction,
-            emailMessage: emailMessageOnOrderSent,
-            createConfirmPayActions: params.createConfirmPayActions,
-            createConfirmReserveActions: params.createConfirmReserveActions
+            emailMessage: emailMessageOnOrderSent
         });
         // ステータス変更
         try {
-            transaction = yield repos.transaction.confirm({
+            yield repos.transaction.confirm({
                 typeOf: transaction.typeOf,
                 id: transaction.id,
                 authorizeActions: transaction.object.authorizeActions,
@@ -140,10 +142,10 @@ function confirm(params) {
             throw error;
         }
         // 万が一処理が想定通りでない場合orderNumberが存在しない
-        if (typeof ((_b = transaction.result) === null || _b === void 0 ? void 0 : _b.order.typeOf) !== 'string') {
-            throw new factory.errors.ServiceUnavailable('transaction.result not found');
-        }
-        return transaction.result;
+        // if (typeof transaction.result?.order.typeOf !== 'string') {
+        //     throw new factory.errors.ServiceUnavailable('transaction.result not found');
+        // }
+        return result;
     });
 }
 exports.confirm = confirm;
@@ -152,33 +154,27 @@ exports.confirm = confirm;
  */
 function publishConfirmationNumberIfNotExist(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        let transaction = yield repos.transaction.findInProgressById({
-            typeOf: factory.transactionType.PlaceOrder,
-            id: params.id
-        });
+        // 最適化(2023-02-03~)
+        let confirmationNumber = yield repos.transaction.findInProgressConfirmationNumberById({ id: params.id });
         // すでに発行済であれば何もしない
-        if (typeof transaction.object.confirmationNumber === 'string') {
-            return transaction.object.confirmationNumber;
+        if (typeof confirmationNumber === 'string') {
+            return confirmationNumber;
         }
         // 確認番号を発行
-        const confirmationNumber = (yield repos.confirmationNumber.publish({
-            orderDate: params.object.orderDate
-        })).toString();
+        confirmationNumber = yield repos.confirmationNumber.publish({ orderDate: params.object.orderDate });
         // 取引に存在しなければ保管
         yield repos.transaction.saveConfirmationNumberIfNotExist({
-            id: transaction.id,
+            id: params.id,
             confirmationNumber
         });
         // 確認番号を取引から再取得
-        transaction = yield repos.transaction.findInProgressById({
-            typeOf: factory.transactionType.PlaceOrder,
-            id: params.id
-        });
+        // 最適化(2023-02-03~)
+        confirmationNumber = yield repos.transaction.findInProgressConfirmationNumberById({ id: params.id });
         // 万が一処理が想定通りでない場合confirmationNumberが存在しない
-        if (typeof transaction.object.confirmationNumber !== 'string') {
+        if (typeof confirmationNumber !== 'string') {
             throw new factory.errors.ServiceUnavailable('transaction.object.confirmationNumber not found');
         }
-        return transaction.object.confirmationNumber;
+        return confirmationNumber;
     });
 }
 exports.publishConfirmationNumberIfNotExist = publishConfirmationNumberIfNotExist;
@@ -187,75 +183,66 @@ exports.publishConfirmationNumberIfNotExist = publishConfirmationNumberIfNotExis
  */
 function publishOrderNumberIfNotExist(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        let transaction = yield repos.transaction.findInProgressById({
-            typeOf: factory.transactionType.PlaceOrder,
-            id: params.id
-        });
+        // 最適化(2023-02-03~)
+        let orderNumber = yield repos.transaction.findInProgressOrderNumberById({ id: params.id });
         // すでに発行済であれば何もしない
-        if (typeof transaction.object.orderNumber === 'string') {
-            return transaction.object.orderNumber;
+        if (typeof orderNumber === 'string') {
+            return orderNumber;
         }
         // 注文番号を発行
-        const project = yield repos.project.findById({ id: transaction.project.id });
-        if (typeof project.alternateName !== 'string') {
+        const { alternateName } = yield repos.project.findAlternateNameById({ id: params.project.id });
+        if (typeof alternateName !== 'string') {
             throw new factory.errors.NotFound('project.alternateName');
         }
-        const orderNumber = yield repos.orderNumber.publishByTimestamp({
-            project: { alternateName: project.alternateName },
+        orderNumber = yield repos.orderNumber.publishByTimestamp({
+            project: { alternateName },
             orderDate: params.object.orderDate
         });
         // 取引に存在しなければ保管
-        yield repos.transaction.saveOrderNumberIfNotExist({
-            id: transaction.id,
-            orderNumber
-        });
+        yield repos.transaction.saveOrderNumberIfNotExist({ id: params.id, orderNumber });
         // 注文番号を取引から再取得
-        transaction = yield repos.transaction.findInProgressById({
-            typeOf: factory.transactionType.PlaceOrder,
-            id: params.id
-        });
+        // 最適化(2023-02-03~)
+        orderNumber = yield repos.transaction.findInProgressOrderNumberById({ id: params.id });
         // 万が一処理が想定通りでない場合orderNumberが存在しない
-        if (typeof transaction.object.orderNumber !== 'string') {
+        if (typeof orderNumber !== 'string') {
             throw new factory.errors.ServiceUnavailable('transaction.object.orderNumber not found');
         }
-        return transaction.object.orderNumber;
+        return orderNumber;
     });
 }
 exports.publishOrderNumberIfNotExist = publishOrderNumberIfNotExist;
 function createResult(params) {
-    return () => __awaiter(this, void 0, void 0, function* () {
-        const transaction = params.transaction;
-        // 取引の確定条件が全て整っているかどうか確認
-        (0, validation_1.validateTransaction)(transaction);
-        // 注文作成
-        const order = (0, result_1.createOrder)({
-            orderNumber: params.orderNumber,
-            transaction: transaction,
-            orderDate: params.result.order.orderDate,
-            orderStatus: factory.orderStatus.OrderProcessing,
-            isGift: false
-        });
-        (0, validation_1.validateEventOffers)({
-            transaction: transaction,
-            order: order
-        });
-        // 注文アイテム数制限確認
-        (0, validation_1.validateNumItems)({
-            order: order,
-            result: params.result
-        });
-        (0, validation_1.validatePaymentMethods)({ order });
-        // 確認番号を発行
-        const { confirmationNumber, identifier, url } = yield createConfirmationNumber({
-            order: order,
-            transaction: transaction,
-            result: params.result
-        })();
-        order.confirmationNumber = confirmationNumber;
-        order.identifier = identifier;
-        order.url = url;
-        return { order };
+    const transaction = params.transaction;
+    // 取引の確定条件が全て整っているかどうか確認
+    (0, validation_1.validateTransaction)(transaction);
+    // 注文作成
+    const order = (0, result_1.createOrder)({
+        orderNumber: params.orderNumber,
+        transaction: transaction,
+        orderDate: params.result.order.orderDate,
+        orderStatus: factory.orderStatus.OrderProcessing,
+        isGift: false
     });
+    (0, validation_1.validateEventOffers)({
+        transaction: transaction,
+        order: order
+    });
+    // 注文アイテム数制限確認
+    (0, validation_1.validateNumItems)({
+        order: order,
+        result: params.result
+    });
+    (0, validation_1.validatePaymentMethods)({ order });
+    // 確認番号を発行
+    const { confirmationNumber, identifier, url } = createConfirmationNumber({
+        order: order,
+        transaction: transaction,
+        result: params.result
+    });
+    order.confirmationNumber = confirmationNumber;
+    order.identifier = identifier;
+    order.url = url;
+    return { order };
 }
 function searchAuthorizeActions(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -273,34 +260,32 @@ function searchAuthorizeActions(params) {
     });
 }
 function createConfirmationNumber(params) {
-    return () => __awaiter(this, void 0, void 0, function* () {
-        const confirmationNumber = params.transaction.object.confirmationNumber;
-        let url = '';
-        let identifier = [];
-        // 取引に確認番号が保管されていなければ、確認番号を発行
-        if (typeof confirmationNumber !== 'string') {
-            // 事前に発行済なはずなので、ありえないフロー
-            throw new factory.errors.ServiceUnavailable('object.confirmationNumber undefined');
-        }
-        // URLの指定があれば上書き
+    const confirmationNumber = params.transaction.object.confirmationNumber;
+    let url = '';
+    let identifier = [];
+    // 取引に確認番号が保管されていなければ、確認番号を発行
+    if (typeof confirmationNumber !== 'string') {
+        // 事前に発行済なはずなので、ありえないフロー
+        throw new factory.errors.ServiceUnavailable('object.confirmationNumber undefined');
+    }
+    // URLの指定があれば上書き
+    // tslint:disable-next-line:no-single-line-block-comment
+    /* istanbul ignore if */
+    if (typeof params.result.order.url === 'string') {
+        url = params.result.order.url;
+    }
+    else /* istanbul ignore next */ if (typeof params.result.order.url === 'function') {
         // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore if */
-        if (typeof params.result.order.url === 'string') {
-            url = params.result.order.url;
-        }
-        else /* istanbul ignore next */ if (typeof params.result.order.url === 'function') {
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore next */
-            url = params.result.order.url(params.order);
-        }
-        // 識別子の指定があれば上書き
-        identifier = [
-            ...(Array.isArray(params.result.order.identifier)) ? params.result.order.identifier : [],
-            // 取引に指定があれば追加
-            ...(Array.isArray(params.transaction.object.identifier)) ? params.transaction.object.identifier : []
-        ];
-        return { confirmationNumber, url, identifier };
-    });
+        /* istanbul ignore next */
+        url = params.result.order.url(params.order);
+    }
+    // 識別子の指定があれば上書き
+    identifier = [
+        ...(Array.isArray(params.result.order.identifier)) ? params.result.order.identifier : [],
+        // 取引に指定があれば追加
+        ...(Array.isArray(params.transaction.object.identifier)) ? params.transaction.object.identifier : []
+    ];
+    return { confirmationNumber, url, identifier };
 }
 /**
  * インセンティブ承認

package/lib/chevre/service/transaction/returnOrder.js

@@ -306,7 +306,7 @@ function validateAppliedReturnPolicy(params) {
 function confirm(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        let transaction = yield repos.transaction.findById({ typeOf: factory.transactionType.ReturnOrder, id: params.id });
+        const transaction = yield repos.transaction.findById({ typeOf: factory.transactionType.ReturnOrder, id: params.id });
         if (transaction.status === factory.transactionStatusType.Confirmed) {
             // すでに確定済の場合
             return transaction.result;
@@ -356,14 +356,14 @@ function confirm(params) {
             // useConfirmRefund: params.useConfirmRefund
         });
         // ステータス変更
-        transaction = yield repos.transaction.confirm({
+        yield repos.transaction.confirm({
             typeOf: transaction.typeOf,
             id: transaction.id,
             authorizeActions: [],
             result: result,
             potentialActions: potentialActions
         });
-        return transaction.result;
+        return result;
     });
 }
 exports.confirm = confirm;
@@ -386,9 +386,11 @@ function exportTasksById(params) {
             transaction,
             runsAt: taskRunsAt
         });
-        yield Promise.all(taskAttributes.map((taskAttribute) => __awaiter(this, void 0, void 0, function* () {
-            yield repos.task.save(taskAttribute);
-        })));
+        // saveManyに変更(2023-02-01~)
+        yield repos.task.saveMany(taskAttributes);
+        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
+        //     await repos.task.save(taskAttribute);
+        // }));
     });
 }
 exports.exportTasksById = exportTasksById;

package/lib/chevre/settings.d.ts

@@ -23,6 +23,8 @@ export declare type ISettings = factory.project.ISettings & {
     maxNumCreditCardPaymentMethod?: number;
 };
 export declare const DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD: string;
+export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
+export declare const USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 /**
  * グローバル設定
  */

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = 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 = void 0;
+exports.settings = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = 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 = void 0;
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
     ? process.env.INFORM_TRANSACTION_URL.split(',')
@@ -14,9 +14,9 @@ const informOrderUrls = (typeof process.env.INFORM_ORDER_URL === 'string')
 const informReservationUrls = (typeof process.env.INFORM_RESERVATION_URL === 'string')
     ? process.env.INFORM_RESERVATION_URL.split(',')
     : [];
-const informUseReservationUrls = (typeof process.env.INFORM_USE_RESERVATION_URL === 'string')
-    ? process.env.INFORM_USE_RESERVATION_URL.split(',')
-    : [];
+// const informUseReservationUrls = (typeof process.env.INFORM_USE_RESERVATION_URL === 'string')
+//     ? process.env.INFORM_USE_RESERVATION_URL.split(',')
+//     : [];
 // tslint:disable-next-line:no-magic-numbers
 const triggerWebhookTimeout = (process.env.TRIGGER_WEBHOOK_TIMEOUT !== undefined) ? Number(process.env.TRIGGER_WEBHOOK_TIMEOUT) : 15000;
 const MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS = (typeof process.env.MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS === 'string')
@@ -43,9 +43,14 @@ exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = 365;
 /**
  * 取引保管期間(Canceled)
  */
-exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = 7;
+exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = (typeof process.env.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS === 'string')
+    ? Number(process.env.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS)
+    // tslint:disable-next-line:no-magic-numbers
+    : 7;
 exports.DEFAULT_SENDER_EMAIL = process.env.DEFAULT_SENDER_EMAIL;
 exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = String(process.env.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD);
+exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_ASSET_TRANSACTION_SYNC_PROCESSING === '1';
+exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING === '1';
 /**
  * グローバル設定
  */
@@ -76,13 +81,16 @@ exports.settings = Object.assign({ transactionWebhookUrls, onOrderStatusChanged:
             .map((url) => {
             return { recipient: { url } };
         })
-    }, onReservationUsed: {
-        informAction: informUseReservationUrls
-            .filter((url) => url.length > 0)
-            .map((url) => {
-            return { recipient: { url } };
-        })
-    }, webhook: {
+    }, 
+    // 廃止(2023-01-30~)
+    // onReservationUsed: {
+    //     informAction: informUseReservationUrls
+    //         .filter((url) => url.length > 0)
+    //         .map((url) => {
+    //             return { recipient: { url } };
+    //         })
+    // },
+    webhook: {
         timeout: triggerWebhookTimeout
     }, maximumReservationGracePeriodInDays: MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS, userPoolIdOld: String(process.env.USERPOOL_ID_OLD), userPoolIdNew: String(process.env.USERPOOL_ID_NEW) }, (typeof MAX_NUM_CREDIT_CARD_PAYMENT_METHOD === 'number')
     ? { maxNumCreditCardPaymentMethod: MAX_NUM_CREDIT_CARD_PAYMENT_METHOD }

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.281.0-alpha.3",
-    "@cinerino/sdk": "3.135.0-alpha.7",
+    "@chevre/factory": "4.286.0",
+    "@cinerino/sdk": "3.138.1",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.2.0-alpha.8"
+  "version": "20.2.0"
 }