@chevre/domain 21.2.0-alpha.83 → 21.2.0-alpha.84

package/example/src/chevre/searchSellers.ts

@@ -19,7 +19,8 @@ async function main() {
         limit: 1,
         typeOf: chevre.factory.assetTransactionType.Reserve,
         object: {
-            reservationFor: { id: { $eq: 'xxx' } }
+            reservationNumber: { $eq: 'xxx' }
+            // reservationFor: { id: { $eq: 'xxx' } }
         }
     });
     console.log('reserveTransactions:', reserveTransactions);

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

@@ -6,7 +6,10 @@ export declare function getOrderWithToken(params: {
     order: factory.order.IOrder;
     expiresIn: number;
 }): Promise<factory.order.IOrder | IOrderWithToken>;
-export declare function createInformTasks(order: factory.order.IOrder | IOrderWithToken): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
+export type IUpdatedOrder4inform = Pick<factory.order.IOrder, 'typeOf' | 'orderNumber' | 'name' | 'additionalProperty' | 'project'> & {
+    orderStatus?: undefined;
+};
+export declare function createInformTasks(order: factory.order.IOrder | IOrderWithToken | IUpdatedOrder4inform): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
 export declare function createConfirmReservationActionObject4ChevreByOrder(params: {
     order: factory.order.IOrder;
 }): factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.Chevre>[];

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

@@ -63,10 +63,13 @@ function createInformTasks(order) {
     let informTasks = [];
     if (Array.isArray(informOrder) && informOrder.length > 0) {
         const order4inform = creteOrder4inform(order);
-        let recipientId = order.customer.id;
-        if (order.orderStatus === factory.orderStatus.OrderReturned) {
-            if (typeof ((_a = order.returner) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-                recipientId = order.returner.id;
+        let recipientId = '';
+        if (typeof order.orderStatus === 'string') {
+            recipientId = order.customer.id;
+            if (order.orderStatus === factory.orderStatus.OrderReturned) {
+                if (typeof ((_a = order.returner) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
+                    recipientId = order.returner.id;
+                }
             }
         }
         informTasks = informOrder.map((informOrderParams) => {
@@ -75,7 +78,6 @@ function createInformTasks(order) {
                 agent: order.project,
                 object: order4inform,
                 project: order.project,
-                // purpose: params.transaction,
                 recipient: {
                     url: (_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url,
                     id: recipientId,
@@ -100,36 +102,41 @@ function createInformTasks(order) {
 }
 exports.createInformTasks = createInformTasks;
 function creteOrder4inform(order) {
-    if (order.orderStatus === factory.orderStatus.OrderReturned) {
-        // 返品注文通知内容を最適化(2022-12-28~)
-        return Object.assign(Object.assign({ project: order.project, typeOf: order.typeOf, orderNumber: order.orderNumber, orderStatus: order.orderStatus }, (order.dateReturned !== undefined) ? { dateReturned: order.dateReturned } : undefined), (typeof order.id === 'string') ? { id: order.id } : undefined);
-    }
-    else if (order.orderStatus === factory.orderStatus.OrderDelivered) {
-        // 配送済注文通知内容を最適化(2022-12-29~)
-        return Object.assign({ project: order.project, typeOf: order.typeOf, orderNumber: order.orderNumber, orderStatus: order.orderStatus }, (typeof order.id === 'string') ? { id: order.id } : undefined);
+    if (typeof order.orderStatus === 'string') {
+        if (order.orderStatus === factory.orderStatus.OrderReturned) {
+            // 返品注文通知内容を最適化(2022-12-28~)
+            return Object.assign(Object.assign({ project: order.project, typeOf: order.typeOf, orderNumber: order.orderNumber, orderStatus: order.orderStatus }, (order.dateReturned !== undefined) ? { dateReturned: order.dateReturned } : undefined), (typeof order.id === 'string') ? { id: order.id } : undefined);
+        }
+        else if (order.orderStatus === factory.orderStatus.OrderDelivered) {
+            // 配送済注文通知内容を最適化(2022-12-29~)
+            return Object.assign({ project: order.project, typeOf: order.typeOf, orderNumber: order.orderNumber, orderStatus: order.orderStatus }, (typeof order.id === 'string') ? { id: order.id } : undefined);
+        }
+        else {
+            // 冗長な個人情報をmask
+            return Object.assign(Object.assign({ 
+                // whitelistで作成する(2022-07-19~)
+                project: order.project, typeOf: order.typeOf, seller: order.seller, price: order.price, priceCurrency: order.priceCurrency, confirmationNumber: order.confirmationNumber, orderNumber: order.orderNumber, acceptedOffers: order.acceptedOffers, orderStatus: order.orderStatus, orderDate: order.orderDate, 
+                // mask
+                customer: Object.assign(Object.assign({}, (0, order_1.createMaskedCustomer)(order)), { additionalProperty: (Array.isArray(order.customer.additionalProperty)) ? order.customer.additionalProperty : [], 
+                    // identifierは必要
+                    // 予約後を隠蔽(2022-12-24~)
+                    identifier: (Array.isArray(order.customer.identifier))
+                        ? order.customer.identifier.filter((p) => {
+                            return !reservedAgentIdentifireNames_1.RESERVED_AGENT_IDENTIFIER_NAMES.includes(p.name);
+                        })
+                        : [] }), 
+                // paymentMethodsに関してもmask(2022-05-30~)
+                paymentMethods: order.paymentMethods.map((p) => {
+                    return Object.assign(Object.assign({}, p), (typeof p.accountId === 'string' && p.accountId.length > 0)
+                        ? { accountId: ASTERISK_CHARACTER.repeat(p.accountId.length) }
+                        : undefined);
+                }) }, (typeof order.token === 'string')
+                ? { token: order.token }
+                : undefined), (typeof order.id === 'string') ? { id: order.id } : undefined);
+        }
     }
     else {
-        // 冗長な個人情報をmask
-        return Object.assign(Object.assign({ 
-            // whitelistで作成する(2022-07-19~)
-            project: order.project, typeOf: order.typeOf, seller: order.seller, price: order.price, priceCurrency: order.priceCurrency, confirmationNumber: order.confirmationNumber, orderNumber: order.orderNumber, acceptedOffers: order.acceptedOffers, orderStatus: order.orderStatus, orderDate: order.orderDate, 
-            // mask
-            customer: Object.assign(Object.assign({}, (0, order_1.createMaskedCustomer)(order)), { additionalProperty: (Array.isArray(order.customer.additionalProperty)) ? order.customer.additionalProperty : [], 
-                // identifierは必要
-                // 予約後を隠蔽(2022-12-24~)
-                identifier: (Array.isArray(order.customer.identifier))
-                    ? order.customer.identifier.filter((p) => {
-                        return !reservedAgentIdentifireNames_1.RESERVED_AGENT_IDENTIFIER_NAMES.includes(p.name);
-                    })
-                    : [] }), 
-            // paymentMethodsに関してもmask(2022-05-30~)
-            paymentMethods: order.paymentMethods.map((p) => {
-                return Object.assign(Object.assign({}, p), (typeof p.accountId === 'string' && p.accountId.length > 0)
-                    ? { accountId: ASTERISK_CHARACTER.repeat(p.accountId.length) }
-                    : undefined);
-            }) }, (typeof order.token === 'string')
-            ? { token: order.token }
-            : undefined), (typeof order.id === 'string') ? { id: order.id } : undefined);
+        return order;
     }
 }
 function createConfirmReservationActionObject4ChevreByOrder(params) {

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

@@ -0,0 +1,15 @@
+/**
+ * 注文変更時処理
+ */
+import { MongoRepository as TaskRepo } from '../../repo/task';
+import * as factory from '../../factory';
+export declare function onOrderUpdated(params: {
+    additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
+    name?: string;
+    orderNumber: string;
+    project: {
+        id: string;
+    };
+}): (repos: {
+    task: TaskRepo;
+}) => Promise<void>;

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

@@ -0,0 +1,22 @@
+"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.onOrderUpdated = void 0;
+const factory = require("../../factory");
+const factory_1 = require("./onOrderStatusChanged/factory");
+function onOrderUpdated(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        let tasks = [];
+        tasks = (0, factory_1.createInformTasks)(Object.assign(Object.assign({ typeOf: factory.order.OrderType.Order, orderNumber: params.orderNumber, project: { id: params.project.id, typeOf: factory.organizationType.Project } }, (typeof params.name === 'string') ? { name: params.name } : undefined), (Array.isArray(params.additionalProperty)) ? { additionalProperty: params.additionalProperty } : undefined));
+        yield repos.task.saveMany(tasks, { emitImmediately: true });
+    });
+}
+exports.onOrderUpdated = onOrderUpdated;

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

@@ -168,44 +168,59 @@ function placeOrder(params) {
             confirmationNumber: params.object.confirmationNumber,
             orderNumber: params.object.orderNumber
         })({ transaction: repos.transaction });
-        // アクションを作成する(2022-04-11~)
         const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
         const simpleOrder = {
-            // project: order.project,
             typeOf: order.typeOf,
             seller: order.seller,
             customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
-            // IOrderへ移行(2022-11-17~)
-            // confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
             price: order.price,
             priceCurrency: order.priceCurrency,
             orderDate: order.orderDate
         };
+        const orderActionPurpose = {
+            typeOf: placeOrderTransaction.typeOf, id: placeOrderTransaction.id
+        };
         const orderActionAttributes = {
             agent: (typeof ((_a = params.agent) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? params.agent : order.project,
             object: simpleOrder,
             potentialActions: {},
             project: order.project,
-            purpose: { typeOf: placeOrderTransaction.typeOf, id: placeOrderTransaction.id },
+            purpose: orderActionPurpose,
             typeOf: factory.actionType.OrderAction
         };
-        const action = yield repos.action.start(orderActionAttributes);
-        try {
-            yield repos.order.createIfNotExist(order);
-        }
-        catch (error) {
-            // actionにエラー結果を追加
+        // 冪等性を担保(2023-05-31~)
+        const completedActions = yield repos.action.search({
+            limit: 1,
+            page: 1,
+            actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+            typeOf: { $eq: orderActionAttributes.typeOf },
+            object: {
+                orderNumber: { $in: [orderActionAttributes.object.orderNumber] }
+            },
+            purpose: {
+                id: { $in: [orderActionPurpose.id] },
+                typeOf: { $in: [orderActionPurpose.typeOf] }
+            }
+        }, ['_id'], []);
+        if (completedActions.length === 0) {
+            const action = yield repos.action.start(orderActionAttributes);
             try {
-                const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
-                yield repos.action.giveUp({ typeOf: orderActionAttributes.typeOf, id: action.id, error: actionError });
+                yield repos.order.createIfNotExist(order);
             }
-            catch (__) {
-                // 失敗したら仕方ない
+            catch (error) {
+                // actionにエラー結果を追加
+                try {
+                    const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
+                    yield repos.action.giveUp({ typeOf: orderActionAttributes.typeOf, id: action.id, error: actionError });
+                }
+                catch (__) {
+                    // 失敗したら仕方ない
+                }
+                throw error;
             }
-            throw error;
+            yield repos.action.complete({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
         }
-        yield repos.action.complete({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
         if (params.useOnOrderStatusChanged || params.useOnOrderStatusChanged === undefined) {
             // 経理レポートを保管
             yield (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)(order)({ accountingReport: repos.accountingReport });

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

@@ -42,12 +42,9 @@ function returnOrder(params) {
             throw new factory.errors.NotFound(factory.transactionType.ReturnOrder);
         }
         const simpleOrder = {
-            // project: order.project,
             typeOf: order.typeOf,
             seller: order.seller,
             customer: (0, order_1.createMaskedCustomer)(order),
-            // IOrderへ移行(2022-11-17~)
-            // confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
             price: order.price,
             priceCurrency: order.priceCurrency,

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

@@ -40,16 +40,11 @@ function sendOrder(params) {
             if (order.confirmationNumber !== confirmationNumber) {
                 throw new factory.errors.NotFound('Order');
             }
-            // SendOrderアクションを作成する
-            // minimizeする(2022-04-18~)
             const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
             const simpleOrder = {
-                // project: order.project,
                 typeOf: order.typeOf,
                 seller: order.seller,
                 customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
-                // IOrderへ移行(2022-11-17~)
-                // confirmationNumber: order.confirmationNumber,
                 orderNumber: order.orderNumber,
                 price: order.price,
                 priceCurrency: order.priceCurrency,

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

@@ -3,7 +3,8 @@
  */
 import { deleteOrder } from './order/deleteOrder';
 import { onOrderStatusChanged } from './order/onOrderStatusChanged';
+import { onOrderUpdated } from './order/onOrderUpdated';
 import { placeOrder, placeOrderWithoutTransaction } from './order/placeOrder';
 import { returnOrder } from './order/returnOrder';
 import { sendOrder } from './order/sendOrder';
-export { deleteOrder, onOrderStatusChanged, placeOrder, placeOrderWithoutTransaction, returnOrder, sendOrder };
+export { deleteOrder, onOrderStatusChanged, onOrderUpdated, placeOrder, placeOrderWithoutTransaction, returnOrder, sendOrder };

package/lib/chevre/service/order.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendOrder = exports.returnOrder = exports.placeOrderWithoutTransaction = exports.placeOrder = exports.onOrderStatusChanged = exports.deleteOrder = void 0;
+exports.sendOrder = exports.returnOrder = exports.placeOrderWithoutTransaction = exports.placeOrder = exports.onOrderUpdated = exports.onOrderStatusChanged = exports.deleteOrder = void 0;
 /**
  * 注文サービス
  */
@@ -8,6 +8,8 @@ const deleteOrder_1 = require("./order/deleteOrder");
 Object.defineProperty(exports, "deleteOrder", { enumerable: true, get: function () { return deleteOrder_1.deleteOrder; } });
 const onOrderStatusChanged_1 = require("./order/onOrderStatusChanged");
 Object.defineProperty(exports, "onOrderStatusChanged", { enumerable: true, get: function () { return onOrderStatusChanged_1.onOrderStatusChanged; } });
+const onOrderUpdated_1 = require("./order/onOrderUpdated");
+Object.defineProperty(exports, "onOrderUpdated", { enumerable: true, get: function () { return onOrderUpdated_1.onOrderUpdated; } });
 const placeOrder_1 = require("./order/placeOrder");
 Object.defineProperty(exports, "placeOrder", { enumerable: true, get: function () { return placeOrder_1.placeOrder; } });
 Object.defineProperty(exports, "placeOrderWithoutTransaction", { enumerable: true, get: function () { return placeOrder_1.placeOrderWithoutTransaction; } });

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

@@ -49,8 +49,8 @@ function confirmReservation(params) {
     });
 }
 exports.confirmReservation = confirmReservation;
-// tslint:disable-next-line:max-func-body-length
 function reserveIfNotYet(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const reservationPackage = params.object;
@@ -58,6 +58,7 @@ function reserveIfNotYet(params) {
         const completedActions = yield repos.action.search({
             limit: 1,
             page: 1,
+            actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
             typeOf: { $eq: params.typeOf },
             object: {
                 typeOf: { $eq: params.object.typeOf }

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.83"
+  "version": "21.2.0-alpha.84"
 }