@chevre/domain 21.20.0-alpha.13 → 21.20.0-alpha.14

package/example/src/chevre/onAssetTransactionStatusChanged.ts

@@ -0,0 +1,36 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    (await chevre.service.order.createService())
+        .onAssetTransactionStatusChanged({
+            project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
+            object: {
+                typeOf: chevre.factory.assetTransactionType.Reserve,
+                transactionNumber: '863918387495116',
+                status: chevre.factory.transactionStatusType.Confirmed
+            },
+            purpose: {
+                confirmationNumber: '',
+                orderNumber: 'CIN1-3748070-2008463',
+                typeOf: chevre.factory.order.OrderType.Order
+            },
+            useOnOrderStatusChanged: true
+        })({
+            assetTransaction: await chevre.repository.AssetTransaction.createInstance(mongoose.connection),
+            acceptedOffer: await chevre.repository.AcceptedOffer.createInstance(mongoose.connection),
+            order: await chevre.repository.Order.createInstance(mongoose.connection),
+            task: await chevre.repository.Task.createInstance(mongoose.connection),
+            transaction: await chevre.repository.Transaction.createInstance(mongoose.connection)
+        });
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -471,7 +471,7 @@ function exportTasksById(params) {
             purpose: {
                 confirmationNumber: '',
                 orderNumber: '',
-                typeOf: 'Order'
+                typeOf: factory.order.OrderType.Order
             },
             useOnOrderStatusChanged: true
         };

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

@@ -74,7 +74,7 @@ function onConfirmed(params) {
                     purpose: {
                         confirmationNumber: params.purpose.confirmationNumber,
                         orderNumber: params.purpose.orderNumber,
-                        typeOf: 'Order'
+                        typeOf: factory.order.OrderType.Order
                     },
                     useOnOrderStatusChanged: params.useOnOrderStatusChanged === true
                 };

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

@@ -24,4 +24,14 @@ declare function paymentDue2Processing(params: {
     task: TaskRepo;
     transaction: TransactionRepo;
 }) => Promise<void>;
-export { onAssetTransactionStatusChanged, paymentDue2Processing };
+declare function processing2inTransit(params: {
+    project: {
+        id: string;
+    };
+    orderNumber: string;
+    useOnOrderStatusChanged: boolean;
+}): (repos: {
+    order: OrderRepo;
+    task: TaskRepo;
+}) => Promise<void>;
+export { onAssetTransactionStatusChanged, paymentDue2Processing, processing2inTransit };

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

@@ -9,10 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.paymentDue2Processing = exports.onAssetTransactionStatusChanged = void 0;
+exports.processing2inTransit = exports.paymentDue2Processing = exports.onAssetTransactionStatusChanged = void 0;
 const findPlaceOrderTransaction_1 = require("./findPlaceOrderTransaction");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory = require("../../factory");
+// tslint:disable-next-line:max-func-body-length
 function onAssetTransactionStatusChanged(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e;
@@ -21,10 +22,10 @@ function onAssetTransactionStatusChanged(params) {
         }
         switch (params.object.status) {
             case factory.transactionStatusType.Confirmed:
+                const orderNumber = (_a = params.purpose) === null || _a === void 0 ? void 0 : _a.orderNumber;
+                const confirmationNumber = (_b = params.purpose) === null || _b === void 0 ? void 0 : _b.confirmationNumber;
                 switch (params.object.typeOf) {
                     case factory.assetTransactionType.Pay:
-                        const orderNumber = (_a = params.purpose) === null || _a === void 0 ? void 0 : _a.orderNumber;
-                        const confirmationNumber = (_b = params.purpose) === null || _b === void 0 ? void 0 : _b.confirmationNumber;
                         // 確定時の決済方法区分指定(2023-08-29~)
                         const specifiedPaymentMethodIdentifire = (_e = (_d = (_c = params.object) === null || _c === void 0 ? void 0 : _c.object) === null || _d === void 0 ? void 0 : _d.paymentMethod) === null || _e === void 0 ? void 0 : _e.identifier;
                         if (typeof specifiedPaymentMethodIdentifire === 'string' && specifiedPaymentMethodIdentifire.length > 0) {
@@ -48,6 +49,34 @@ function onAssetTransactionStatusChanged(params) {
                             }
                         }
                         break;
+                    case 'COAReserveTransaction':
+                        if (typeof orderNumber === 'string' && typeof confirmationNumber === 'string') {
+                            // 基本的に1注文に1予約番号なのでdeliverable = true
+                            const deliverable = true;
+                            if (deliverable) {
+                                yield processing2inTransit({
+                                    project: { id: params.project.id },
+                                    // confirmationNumber,
+                                    orderNumber,
+                                    useOnOrderStatusChanged: params.useOnOrderStatusChanged
+                                })(repos);
+                            }
+                        }
+                        break;
+                    case factory.assetTransactionType.Reserve:
+                        if (typeof orderNumber === 'string' && typeof confirmationNumber === 'string') {
+                            // ReserveTransactionのステータス検証
+                            const deliverable = yield isDeliverable({ project: { id: params.project.id }, orderNumber })(repos);
+                            if (deliverable) {
+                                yield processing2inTransit({
+                                    project: { id: params.project.id },
+                                    // confirmationNumber,
+                                    orderNumber,
+                                    useOnOrderStatusChanged: params.useOnOrderStatusChanged
+                                })(repos);
+                            }
+                        }
+                        break;
                     default:
                     // no op
                 }
@@ -230,3 +259,80 @@ function cancelOrderIfExist(params) {
         }
     });
 }
+function isDeliverable(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // 注文のreservationNumberを取得
+        const reservationNumbers = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.itemOffered.reservationNumber');
+        // ReserveTransactionのステータス検証
+        let allReserveTransactionConfirmed = false;
+        if (reservationNumbers.length > 0) {
+            // console.log('is deliverable?...', params.orderNumber, reservationNumbers);
+            const referencedReserveTransactions = yield repos.assetTransaction.search({
+                project: { id: { $eq: params.project.id } },
+                typeOf: factory.assetTransactionType.Reserve,
+                transactionNumber: { $in: reservationNumbers }
+            }, ['status']);
+            // console.log('referencedReserveTransactions:', referencedReserveTransactions);
+            allReserveTransactionConfirmed =
+                referencedReserveTransactions.length === reservationNumbers.length
+                    && referencedReserveTransactions.every(({ status }) => status === factory.transactionStatusType.Confirmed);
+        }
+        else {
+            allReserveTransactionConfirmed = true;
+        }
+        return allReserveTransactionConfirmed;
+    });
+}
+function processing2inTransit(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // const placeOrderTransaction = await findPlaceOrderTransaction({
+        //     project: { id: params.project.id },
+        //     confirmationNumber: params.confirmationNumber,
+        //     orderNumber: params.orderNumber
+        // })({ transaction: repos.transaction });
+        const order = yield repos.order.findByOrderNumber({
+            orderNumber: params.orderNumber,
+            project: { id: params.project.id },
+            inclusion: [],
+            exclusion: ['acceptedOffers']
+        });
+        try {
+            // console.log('OrderProcessing -> OrderInTransit');
+            // tslint:disable-next-line:no-suspicious-comment
+            // TODO OrderInTransitへの変更を保留
+            // order = await repos.order.changeStatus({
+            //     project: { id: order.project.id },
+            //     orderNumber: params.orderNumber,
+            //     orderStatus: factory.orderStatus.OrderInTransit,
+            //     previousOrderStatus: factory.orderStatus.OrderProcessing
+            // });
+        }
+        catch (error) {
+            const throwsError = true;
+            // すでにステータスが煤でいた場合、OrderPaymentDue->OrderProcessingの処理自体は成功しているので、後処理を続行する
+            // order = await repos.order.findByOrderNumber({
+            //     orderNumber: params.orderNumber,
+            //     project: { id: params.project.id },
+            //     inclusion: [],
+            //     exclusion: ['acceptedOffers']
+            // });
+            // if (order.orderStatus === factory.orderStatus.OrderDelivered
+            //     || order.orderStatus === factory.orderStatus.OrderReturned) {
+            //     throwsError = false;
+            // }
+            if (throwsError) {
+                throw error;
+            }
+        }
+        if (params.useOnOrderStatusChanged) {
+            yield (0, onOrderStatusChanged_1.onOrderInTransit)({
+                order: Object.assign(Object.assign({}, order), { orderStatus: factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する
+                 })
+                // placeOrderTransaction
+            })({
+                task: repos.task
+            });
+        }
+    });
+}
+exports.processing2inTransit = processing2inTransit;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.d.ts

@@ -0,0 +1,10 @@
+import type { MongoRepository as TaskRepo } from '../../../repo/task';
+import * as factory from '../../../factory';
+declare function onOrderInTransit(params: {
+    order: Omit<factory.order.IOrder, 'orderStatus'> & {
+        orderStatus: factory.orderStatus.OrderProcessing;
+    };
+}): (repos: {
+    task: TaskRepo;
+}) => Promise<void>;
+export { onOrderInTransit };

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

@@ -0,0 +1,82 @@
+"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.onOrderInTransit = void 0;
+/**
+ * 注文処理時処理
+ */
+const createDebug = require("debug");
+const factory = require("../../../factory");
+const order_1 = require("../../../factory/order");
+const settings_1 = require("../../../settings");
+// import {
+//     IExternalOrder
+// } from './onOrderProcessing/factory';
+const debug = createDebug('chevre-domain:service:order');
+// type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'typeOf' | 'potentialActions'>;
+function onOrderInTransit(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
+        // let tasks: factory.task.IAttributes<factory.taskName>[] = [];
+        // await repos.task.saveMany(tasks, { emitImmediately: true });
+        switch (params.order.orderStatus) {
+            case factory.orderStatus.OrderProcessing:
+                // 冗長なsendOrderタスク作成を回避(2023-08-25~)
+                yield createSendOrderTransactionTaskIfNotExist({
+                    order: params.order
+                    // potentialActions: params.placeOrderTransaction?.potentialActions?.order?.potentialActions
+                })(repos);
+                break;
+            default:
+        }
+    });
+}
+exports.onOrderInTransit = onOrderInTransit;
+function createSendOrderTransactionTaskIfNotExist(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const now = new Date();
+        const maskedCustomer = (0, order_1.createMaskedCustomer)({ customer: params.order.customer }, { noProfile: true });
+        const simpleOrder = {
+            typeOf: params.order.typeOf,
+            seller: {
+                id: params.order.seller.id,
+                typeOf: params.order.seller.typeOf,
+                name: params.order.seller.name
+            },
+            // mask
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
+            orderNumber: params.order.orderNumber,
+            price: params.order.price,
+            priceCurrency: params.order.priceCurrency,
+            orderDate: params.order.orderDate
+        };
+        const sendOrderObject = Object.assign(Object.assign({}, simpleOrder), { acceptedOffers: {
+                limit: settings_1.DELIVER_ORDER_LIMIT,
+                page: 1 // page1から配送
+            } });
+        const sendOrderTaskData = {
+            project: params.order.project,
+            object: Object.assign(Object.assign({}, sendOrderObject), { confirmationNumber: params.order.confirmationNumber })
+        };
+        const sendOrderTask = {
+            project: params.order.project,
+            name: factory.taskName.SendOrder,
+            status: factory.taskStatus.Ready,
+            runsAt: now,
+            remainingNumberOfTries: 10,
+            numberOfTried: 0,
+            executionResults: [],
+            data: sendOrderTaskData
+        };
+        debug('processing createSendOrderTaskIfNotExist...', sendOrderTask);
+        yield repos.task.createSendOrderTaskIfNotExist(sendOrderTask, { emitImmediately: true });
+    });
+}

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

@@ -4,7 +4,8 @@
 import { onOrderCancelled } from './onOrderStatusChanged/onOrderCancelled';
 import { onOrderDelivered } from './onOrderStatusChanged/onOrderDelivered';
 import { onOrderDeliveredPartially } from './onOrderStatusChanged/onOrderDeliveredPartially';
+import { onOrderInTransit } from './onOrderStatusChanged/onOrderInTransit';
 import { onOrderPaymentDue } from './onOrderStatusChanged/onOrderPaymentDue';
 import { IExternalOrder, onOrderProcessing } from './onOrderStatusChanged/onOrderProcessing';
 import { onOrderReturned } from './onOrderStatusChanged/onOrderReturned';
-export { IExternalOrder, onOrderCancelled, onOrderDelivered, onOrderDeliveredPartially, onOrderPaymentDue, onOrderProcessing, onOrderReturned };
+export { IExternalOrder, onOrderCancelled, onOrderDelivered, onOrderDeliveredPartially, onOrderInTransit, onOrderPaymentDue, onOrderProcessing, onOrderReturned };

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onOrderReturned = exports.onOrderProcessing = exports.onOrderPaymentDue = exports.onOrderDeliveredPartially = exports.onOrderDelivered = exports.onOrderCancelled = void 0;
+exports.onOrderReturned = exports.onOrderProcessing = exports.onOrderPaymentDue = exports.onOrderInTransit = exports.onOrderDeliveredPartially = exports.onOrderDelivered = exports.onOrderCancelled = void 0;
 /**
  * 注文ステータス変更時処理
  */
@@ -10,6 +10,8 @@ const onOrderDelivered_1 = require("./onOrderStatusChanged/onOrderDelivered");
 Object.defineProperty(exports, "onOrderDelivered", { enumerable: true, get: function () { return onOrderDelivered_1.onOrderDelivered; } });
 const onOrderDeliveredPartially_1 = require("./onOrderStatusChanged/onOrderDeliveredPartially");
 Object.defineProperty(exports, "onOrderDeliveredPartially", { enumerable: true, get: function () { return onOrderDeliveredPartially_1.onOrderDeliveredPartially; } });
+const onOrderInTransit_1 = require("./onOrderStatusChanged/onOrderInTransit");
+Object.defineProperty(exports, "onOrderInTransit", { enumerable: true, get: function () { return onOrderInTransit_1.onOrderInTransit; } });
 const onOrderPaymentDue_1 = require("./onOrderStatusChanged/onOrderPaymentDue");
 Object.defineProperty(exports, "onOrderPaymentDue", { enumerable: true, get: function () { return onOrderPaymentDue_1.onOrderPaymentDue; } });
 const onOrderProcessing_1 = require("./onOrderStatusChanged/onOrderProcessing");

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

@@ -12,7 +12,10 @@ export declare function call(data: factory.task.IData<factory.taskName.ConfirmRe
 /**
  * 予約を確定する
  */
-export declare function confirmReserveTransaction(params: factory.action.interact.confirm.reservation.IAttributes<factory.service.webAPI.Identifier>): (repos: {
+export declare function confirmReserveTransaction(params: factory.action.interact.confirm.reservation.IAttributes<factory.service.webAPI.Identifier>, options: {
+    sendOrder: boolean;
+    useOnOrderStatusChanged: boolean;
+}): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;

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

@@ -28,7 +28,10 @@ const coaAuthClient = new COA.auth.RefreshToken({
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        yield confirmReserveTransaction(data)({
+        yield confirmReserveTransaction(data, {
+            sendOrder: true,
+            useOnOrderStatusChanged: true
+        })({
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
@@ -41,7 +44,7 @@ exports.call = call;
 /**
  * 予約を確定する
  */
-function confirmReserveTransaction(params) {
+function confirmReserveTransaction(params, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         // アクション開始
         const confirmActionAttributes = params;
@@ -89,6 +92,42 @@ function confirmReserveTransaction(params) {
         // アクション完了
         const result = {};
         yield repos.action.completeWithVoid({ typeOf: confirmActionAttributes.typeOf, id: action.id, result: result });
+        // sendOrder連携(2024-01-11~)
+        yield onConfirmed(params, options)({
+            task: repos.task
+        });
     });
 }
 exports.confirmReserveTransaction = confirmReserveTransaction;
+function onConfirmed(params, options) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        if (options.sendOrder === true) {
+            // タスク冪等作成
+            const onAssetTransactionStatusChangedTaskData = {
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                object: {
+                    typeOf: params.object.typeOf,
+                    transactionNumber: params.object.transactionNumber,
+                    status: factory.transactionStatusType.Confirmed
+                },
+                purpose: {
+                    confirmationNumber: '',
+                    orderNumber: params.purpose.orderNumber,
+                    typeOf: factory.order.OrderType.Order
+                },
+                useOnOrderStatusChanged: options.useOnOrderStatusChanged === true
+            };
+            const onAssetTransactionStatusChangedTask = {
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                name: factory.taskName.OnAssetTransactionStatusChanged,
+                status: factory.taskStatus.Ready,
+                runsAt: new Date(),
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: onAssetTransactionStatusChangedTaskData
+            };
+            yield repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask, { emitImmediately: true });
+        }
+    });
+}

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.351.0-alpha.6",
+    "@chevre/factory": "4.351.0-alpha.7",
     "@cinerino/sdk": "5.8.0-alpha.1",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.3.0-alpha.0",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.20.0-alpha.13"
+  "version": "21.20.0-alpha.14"
 }