@chevre/domain 25.2.0-alpha.53 → 25.2.0-alpha.55

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

@@ -18,5 +18,5 @@ declare function createInformTasks(params: {
 }, setting: Pick<ISetting, 'onOrderStatusChanged'> | null): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
 declare function createNextSendOrderTasks(params: {
     order: IInTransitOrder;
-}): (import("@chevre/factory/lib/chevre/task").ITaskAttributes | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/chevre/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/chevre/task/onEventChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceDeleted").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/chevre/task/placeOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/chevre/task/sendOrder").IAttributes | import("@chevre/factory/lib/chevre/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/chevre/task/useReservation").IAttributes | import("@chevre/factory/lib/chevre/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/voidReserveTransaction").IAttributes)[];
+}): (import("@chevre/factory/lib/chevre/task").ITaskAttributes | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/chevre/task/onEventChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceDeleted").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/chevre/task/placeOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/chevre/task/sendOrder").IAttributes | import("@chevre/factory/lib/chevre/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/chevre/task/useReservation").IAttributes | import("@chevre/factory/lib/chevre/task/voidPayTransaction").IAttributes)[];
 export { createInformTasks, createNextSendOrderTasks, IInTransitOrder };

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

@@ -1,6 +1,3 @@
-/**
- * 注文決済時処理
- */
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
 declare function onOrderPaymentDue(params: {

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

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onOrderPaymentDue = onOrderPaymentDue;
+/**
+ * 注文決済時処理
+ */
+const util_1 = require("util");
 const factory_1 = require("../../../factory");
 function onOrderPaymentDue(params) {
     return async (repos) => {
@@ -13,8 +17,9 @@ function onOrderPaymentDue(params) {
         switch (params.order.orderStatus) {
             // OrderPaymentDueを追加(2023-08-23~)
             case factory_1.factory.orderStatus.OrderPaymentDue:
+                await createConfirmPayTransactionTasks(params.order, simpleOrder)(repos);
                 tasks = [
-                    ...await createConfirmPayTransactionTasks(params.order, simpleOrder)(repos),
+                    // ...await createConfirmPayTransactionTasks(params.order, simpleOrder)(repos),
                     ...createCreateAccountingReportTask(params.order) // 経理レポート作成タスク(2024-02-02~)
                 ];
                 break;
@@ -27,55 +32,79 @@ function onOrderPaymentDue(params) {
 function createConfirmPayTransactionTasks(order, simpleOrder) {
     return async (repos) => {
         const taskRunsAt = new Date();
-        const tasks = [];
+        // const tasks: factory.task.IAttributes<factory.taskName.ConfirmPayTransaction>[] = [];
         await Promise.all(order.paymentMethods.map(async (invoice) => {
             // PaymentAutomaticallyAppliedであれば、自動決済処理を実行(2023-08-24~)
             if (invoice.paymentStatus !== factory_1.factory.paymentStatusType.PaymentAutomaticallyApplied) {
                 return;
             }
-            // 冗長なタスク作成を回避
-            const existingTasks = await repos.task.projectFields({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: order.project.id } },
+            // 識別子指定でタスク作成(2026-07-30~)
+            const data = {
+                project: order.project,
+                typeOf: factory_1.factory.actionType.ConfirmAction,
+                object: [{ typeOf: factory_1.factory.assetTransactionType.Pay, transactionNumber: invoice.paymentMethodId }],
+                agent: order.project,
+                purpose: {
+                    ...simpleOrder,
+                    confirmationNumber: order.confirmationNumber
+                },
+                processOrder: order.orderStatus === factory_1.factory.orderStatus.OrderPaymentDue, // OrderPaymentDueの場合、processOrderを実行する
+                useOnOrderStatusChanged: true
+            };
+            const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s:%s:%s', order.project.id, factory_1.factory.taskName.ConfirmPayTransaction, data.purpose.typeOf, data.purpose.orderNumber, factory_1.factory.assetTransactionType.Pay, invoice.paymentMethodId);
+            const confirmPayTransactionTask = {
+                alternateName: taskIdentifier,
+                identifier: taskIdentifier,
+                project: order.project,
                 name: factory_1.factory.taskName.ConfirmPayTransaction,
-                data: {
-                    object: { transactionNumber: { $eq: invoice.paymentMethodId } },
-                    purpose: { orderNumber: { $eq: order.orderNumber } }
-                }
-            }, ['id']);
-            if (existingTasks.length === 0) {
-                const data = {
-                    project: order.project,
-                    typeOf: factory_1.factory.actionType.ConfirmAction,
-                    object: [{ typeOf: factory_1.factory.assetTransactionType.Pay, transactionNumber: invoice.paymentMethodId }],
-                    agent: order.project,
-                    purpose: {
-                        ...simpleOrder,
-                        confirmationNumber: order.confirmationNumber
-                    },
-                    // 廃止(2024-03-12~)
-                    // instrument: {
-                    //     typeOf: factory.assetTransactionType.Pay, // 産取引化(2024-03-11~)
-                    //     identifier: factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre,
-                    //     transactionNumber: invoice.paymentMethodId
-                    // },
-                    processOrder: order.orderStatus === factory_1.factory.orderStatus.OrderPaymentDue, // OrderPaymentDueの場合、processOrderを実行する
-                    useOnOrderStatusChanged: true
-                };
-                tasks.push({
-                    project: order.project,
-                    name: factory_1.factory.taskName.ConfirmPayTransaction,
-                    status: factory_1.factory.taskStatus.Ready,
-                    runsAt: taskRunsAt,
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data
-                });
-            }
+                status: factory_1.factory.taskStatus.Ready,
+                runsAt: taskRunsAt,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data
+            };
+            await repos.task.createIfNotExistByAlternateName(confirmPayTransactionTask, { emitImmediately: true });
+            // 冗長なタスク作成を回避
+            // const existingTasks = await repos.task.projectFields(
+            //     {
+            //         limit: 1,
+            //         page: 1,
+            //         project: { id: { $eq: order.project.id } },
+            //         name: factory.taskName.ConfirmPayTransaction,
+            //         data: {
+            //             object: { transactionNumber: { $eq: invoice.paymentMethodId } },
+            //             purpose: { orderNumber: { $eq: order.orderNumber } }
+            //         }
+            //     },
+            //     ['id']
+            // ) as { id: string }[];
+            // if (existingTasks.length === 0) {
+            //     const data: factory.task.IData<factory.taskName.ConfirmPayTransaction> = {
+            //         project: order.project,
+            //         typeOf: factory.actionType.ConfirmAction,
+            //         object: [{ typeOf: factory.assetTransactionType.Pay, transactionNumber: invoice.paymentMethodId }],
+            //         agent: order.project,
+            //         purpose: {
+            //             ...simpleOrder,
+            //             confirmationNumber: order.confirmationNumber
+            //         },
+            //         processOrder: order.orderStatus === factory.orderStatus.OrderPaymentDue, // OrderPaymentDueの場合、processOrderを実行する
+            //         useOnOrderStatusChanged: true
+            //     };
+            //     tasks.push({
+            //         project: order.project,
+            //         name: factory.taskName.ConfirmPayTransaction,
+            //         status: factory.taskStatus.Ready,
+            //         runsAt: taskRunsAt,
+            //         remainingNumberOfTries: 10,
+            //         numberOfTried: 0,
+            //         executionResults: [],
+            //         data
+            //     });
+            // }
         }));
-        return tasks;
+        // return tasks;
     };
 }
 function createCreateAccountingReportTask(order) {

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

@@ -11,5 +11,5 @@ declare function createInformTasks(order: IReturnedOrder, returnOrderAction: IRe
 declare function createOnOrderReturnedTasksByTransaction(params: {
     order: Pick<factory.order.IOrder, 'project' | 'typeOf' | 'orderNumber' | 'customer' | 'price' | 'priceCurrency' | 'orderDate'>;
     potentialActions?: factory.action.transfer.returnAction.order.IPotentialActions;
-}): (import("@chevre/factory/lib/chevre/task").ITaskAttributes | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/chevre/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/chevre/task/onEventChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceDeleted").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/chevre/task/placeOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/chevre/task/sendOrder").IAttributes | import("@chevre/factory/lib/chevre/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/chevre/task/useReservation").IAttributes | import("@chevre/factory/lib/chevre/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/voidReserveTransaction").IAttributes)[];
+}): (import("@chevre/factory/lib/chevre/task").ITaskAttributes | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/chevre/task/onEventChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceDeleted").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/chevre/task/placeOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/chevre/task/sendOrder").IAttributes | import("@chevre/factory/lib/chevre/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/chevre/task/useReservation").IAttributes | import("@chevre/factory/lib/chevre/task/voidPayTransaction").IAttributes)[];
 export { createInformTasks, createOnOrderReturnedTasksByTransaction, IReturnAction };

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

@@ -17,13 +17,11 @@ function findAcceptAction(params, options) {
         }
         // 非同期アクションが存在しなければタスクを参照
         if (task === undefined) {
-            task = (await repos.task.projectFields({
-                limit: 1,
-                page: 1,
+            task = await repos.task.findTaskById({
                 id: { $eq: params.sameAs.id },
                 project: { id: { $eq: params.project.id } },
                 name: factory_1.factory.taskName.PublishPaymentUrl
-            }, ['status', 'executionResults'])).shift();
+            }, ['status', 'executionResults']);
         }
         if (task === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.taskName.PublishPaymentUrl);

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

@@ -17,13 +17,11 @@ function findAuthorizeAction(params, options) {
         }
         // 非同期アクションが存在しなければタスクを参照
         if (task === undefined) {
-            task = (await repos.task.projectFields({
-                limit: 1,
-                page: 1,
+            task = await repos.task.findTaskById({
                 id: { $eq: params.sameAs.id },
                 project: { id: { $eq: params.project.id } },
                 name: factory_1.factory.taskName.AuthorizePayment
-            }, ['status', 'executionResults'])).shift();
+            }, ['status', 'executionResults']);
         }
         if (task === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.taskName.AuthorizePayment);

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

@@ -17,13 +17,11 @@ function findCheckAction(params, options) {
         }
         // 非同期アクションが存在しなければタスクを参照
         if (task === undefined) {
-            task = (await repos.task.projectFields({
-                limit: 1,
-                page: 1,
+            task = await repos.task.findTaskById({
                 id: { $eq: params.sameAs.id },
                 project: { id: { $eq: params.project.id } },
                 name: factory_1.factory.taskName.CheckMovieTicket
-            }, ['status', 'executionResults'])).shift();
+            }, ['status', 'executionResults']);
         }
         if (task === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.taskName.CheckMovieTicket);

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

@@ -3,4 +3,4 @@ import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../tas
 /**
  * タスク実行関数
  */
-export declare function call(params: Pick<factory.task.ITask<factory.taskName.VoidReserveTransaction>, IExecutableTaskKeys>): IOperationExecute<ICallResult>;
+export declare function call(params: Pick<factory.task.voidReserveTransaction.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

package/lib/chevre/service/transaction/deleteTransaction.d.ts

@@ -25,5 +25,5 @@ interface IDeleteTransactionRepos {
  * 取引に関わるリソースを削除する
  * 冪等性を確保すること
  */
-export declare function deleteTransaction(params: factory.task.IData<factory.taskName.DeleteTransaction>): (repos: IDeleteTransactionRepos) => Promise<void>;
+export declare function deleteTransaction(params: factory.task.deleteTransaction.IData): (repos: IDeleteTransactionRepos) => Promise<void>;
 export {};

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.d.ts

@@ -1,6 +1,6 @@
 import { factory } from '../../../../factory';
 import type { ISetting } from '../../../../repo/setting';
-type IPlaceOrderPotentialTask = factory.task.IAttributes<factory.taskName.PlaceOrder> | factory.task.IAttributes<factory.taskName.DeleteTransaction> | factory.task.IAttributes<factory.taskName.VoidPayTransaction> | factory.task.IAttributes<factory.taskName.VoidReserveTransaction>;
+type IPlaceOrderPotentialTask = factory.task.IAttributes<factory.taskName.PlaceOrder> | factory.task.deleteTransaction.IAttributes | factory.task.IAttributes<factory.taskName.VoidPayTransaction> | factory.task.voidReserveTransaction.IAttributes;
 /**
  * 取引のタスクを作成する
  */

package/lib/chevre/taskSettings.d.ts

@@ -27,8 +27,9 @@ interface IExecuteOptions {
 type IOperationExecute<T> = (settings: IExecuteSettings, options: IExecuteOptions) => Promise<T>;
 type ICallResult = void | Pick<factory.task.IExecutionResult, 'error'>;
 type ICallableTaskOperation = (task: IExecutableTask<factory.taskName>) => IOperationExecute<ICallResult>;
-type IExecutableTaskKeys = 'data' | 'id' | 'name' | 'status' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'expires';
+type IExecutableTaskKeys = 'data' | 'id' | 'name' | 'status' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt';
 type IExecutableTask<T extends factory.taskName> = Pick<factory.task.ITask<T>, IExecutableTaskKeys> & {
+    expires?: Date;
     status: factory.taskStatus.Running;
 };
 export { ICallableTaskOperation, ICallResult, IExecutableTask, IExecutableTaskKeys, IExecuteSettings, IExecuteOptions, IOperationExecute, AggregationSettings };

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "10.1.0-alpha.1",
+    "@chevre/factory": "10.1.0-alpha.2",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.2.0-alpha.53"
+  "version": "25.2.0-alpha.55"
 }