@chevre/domain 22.9.0-alpha.89 → 22.9.0-alpha.90

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

@@ -5,7 +5,12 @@ type IProcessingOrder = Pick<factory.order.IOrder, 'id' | 'orderNumber' | 'broke
     numAcceptedOffers: number;
     orderStatus: factory.orderStatus.OrderProcessing;
 };
-declare function createInformProcessingOrderTasks(order: IProcessingOrder, setting: Pick<ISetting, 'onOrderStatusChanged'> | null): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
+type ICreatingCheckResourceTask = Pick<factory.task.checkResource.IAttributes, 'alternateName' | 'data' | 'executionResults' | 'identifier' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status'> & {
+    alternateName: string;
+    identifier: string;
+};
+type ICreatingInformProcessingOrderTask = Pick<factory.task.IAttributes<factory.taskName.TriggerWebhook>, 'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status'>;
+declare function createInformProcessingOrderTasks(order: IProcessingOrder, setting: Pick<ISetting, 'onOrderStatusChanged'> | null): ICreatingInformProcessingOrderTask[];
 declare function createConfirmReservationActionObject4ChevreByOrder(params: {
     order: Pick<factory.order.IOrder, 'confirmationNumber' | 'orderNumber'> & {
         serialNumbers: string[];
@@ -17,5 +22,5 @@ declare function createConfirmReservationActionObject4COAByOrder(params: {
     };
 }): factory.task.confirmReserveTransaction.IObject4COAOptimized[];
 type IExternalOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'seller' | 'customer' | 'confirmationNumber' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'name' | 'orderStatus' | 'orderedItem' | 'paymentMethods'>;
-declare function createCheckResourceTask(order: Pick<IProcessingOrder, 'orderNumber' | 'project' | 'typeOf'>): factory.task.checkResource.IAttributes;
-export { IExternalOrder, IProcessingOrder, createInformProcessingOrderTasks, createCheckResourceTask, createConfirmReservationActionObject4ChevreByOrder, createConfirmReservationActionObject4COAByOrder };
+declare function createCheckResourceTask(order: Pick<IProcessingOrder, 'orderNumber' | 'project' | 'typeOf'>): ICreatingCheckResourceTask;
+export { ICreatingCheckResourceTask, ICreatingInformProcessingOrderTask, IExternalOrder, IProcessingOrder, createInformProcessingOrderTasks, createCheckResourceTask, createConfirmReservationActionObject4ChevreByOrder, createConfirmReservationActionObject4COAByOrder };

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

@@ -4,15 +4,13 @@ exports.createInformProcessingOrderTasks = createInformProcessingOrderTasks;
 exports.createCheckResourceTask = createCheckResourceTask;
 exports.createConfirmReservationActionObject4ChevreByOrder = createConfirmReservationActionObject4ChevreByOrder;
 exports.createConfirmReservationActionObject4COAByOrder = createConfirmReservationActionObject4COAByOrder;
+const util = require("util");
 const factory = require("../../../../factory");
 const reservedAgentIdentifireNames_1 = require("../../../../factory/reservedAgentIdentifireNames");
 const ASTERISK_CHARACTER = '*';
-function createInformProcessingOrderTasks(order, 
-// settings: Settings,
-setting) {
+function createInformProcessingOrderTasks(order, setting) {
     var _a;
     const taskRunsAt = new Date();
-    // const informOrder = settings.onOrderStatusChanged?.informOrder;
     const informOrder = (_a = setting === null || setting === void 0 ? void 0 : setting.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
     const informTasks = [];
     const order4inform = creteProcessingOrderAsNotification(order);
@@ -123,7 +121,7 @@ function createConfirmReservationActionObject4COAByOrder(params) {
     });
 }
 function createCheckResourceTask(order) {
-    const taskRunsAt = new Date();
+    const runsAt = new Date();
     const data = {
         object: {
             orderNumber: order.orderNumber,
@@ -132,11 +130,14 @@ function createCheckResourceTask(order) {
         project: order.project,
         typeOf: factory.actionType.CheckAction
     };
+    const taskIdentifier = util.format('%s:%s:%s:%s', order.project.id, factory.taskName.CheckResource, order.typeOf, order.orderNumber);
     return {
+        alternateName: taskIdentifier, // add identifier(2025-03-29~)
+        identifier: taskIdentifier, // add identifier(2025-03-29~)
         project: order.project,
         name: factory.taskName.CheckResource,
         status: factory.taskStatus.Ready,
-        runsAt: taskRunsAt,
+        runsAt,
         remainingNumberOfTries: 10,
         numberOfTried: 0,
         executionResults: [],

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

@@ -28,20 +28,21 @@ function onOrderProcessing(params) {
         const { numTryConfirmReserveTransaction } = settings;
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks = [];
-        // const sendEmailMessageByOrderPotentialActions =
-        //     params.placeOrderTransaction?.potentialActions?.order?.potentialActions?.sendOrder?.potentialActions?.sendEmailMessage;
+        let creatingCheckResourceTask;
         const sendEmailMessageByOnOrderProcessing = (_d = (_c = (_b = (_a = params.placeOrderTransaction) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.onOrderProcessing) === null || _d === void 0 ? void 0 : _d.sendEmailMessage;
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderProcessing:
-                tasks = [
-                    ...(0, factory_1.createInformProcessingOrderTasks)(params.order, setting),
-                    (0, factory_1.createCheckResourceTask)(params.order) // リソース検証タスクを追加(2024-03-13~)
-                ];
+                tasks = (0, factory_1.createInformProcessingOrderTasks)(params.order, setting);
+                creatingCheckResourceTask = (0, factory_1.createCheckResourceTask)(params.order); // リソース検証タスクを追加(2024-03-13~)
                 break;
             default:
                 throw new factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
         }
         yield repos.task.saveMany(tasks, { emitImmediately: true });
+        // uniqueness of CheckResource task(2025-03-29~)
+        if (creatingCheckResourceTask !== undefined) {
+            yield repos.task.createIfNotExistByAlternateName(creatingCheckResourceTask, { emitImmediately: true });
+        }
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderProcessing:
                 yield (0, processOrder_1.processOrder)({
@@ -54,7 +55,6 @@ function onOrderProcessing(params) {
                 // OrderProcessingにおけるEメール送信に対応(2024-01-17~)
                 yield (0, createSendEmailMessageTaskIfNotExist_1.createSendEmailMessageTaskIfNotExist)({
                     sendEmailMessage: [
-                        // ...(Array.isArray(sendEmailMessageByOrderPotentialActions)) ? sendEmailMessageByOrderPotentialActions : [],
                         ...(Array.isArray(sendEmailMessageByOnOrderProcessing)) ? sendEmailMessageByOnOrderProcessing : []
                     ],
                     order: params.order

package/package.json

@@ -113,5 +113,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.9.0-alpha.89"
+  "version": "22.9.0-alpha.90"
 }