@chevre/domain 25.0.0-alpha.23 → 25.0.0-alpha.24

package/lib/chevre/repo/message.d.ts

@@ -66,18 +66,6 @@ export declare class MessageRepo {
     deleteDatePublishedPassedCertainPeriod(params: {
         $lt: Date;
     }): Promise<void>;
-    deleteByMainEntityOrderNumber(params: {
-        project: {
-            id: string;
-        };
-        mainEntity: {
-            orderNumber: string;
-        };
-    }): Promise<{
-        n?: number;
-        ok?: number;
-        deletedCount?: number;
-    } | null>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;

package/lib/chevre/repo/message.js

@@ -173,22 +173,31 @@ class MessageRepo {
                 .exec();
         }
     }
-    async deleteByMainEntityOrderNumber(params) {
-        return this.messageModel.deleteMany({
-            'project.id': { $eq: params.project.id },
-            'mainEntity.orderNumber': { $exists: true, $eq: params.mainEntity.orderNumber }
-        })
-            .exec()
-            .then((result) => {
-            return {
-                // n: result?.n,
-                // opTime: result.opTime,
-                // ok: result?.ok,
-                // operationTime,
-                deletedCount: result?.deletedCount
-            };
-        });
-    }
+    // public async deleteByMainEntityOrderNumber(params: {
+    //     project: { id: string };
+    //     mainEntity: { orderNumber: string };
+    // }): Promise<{
+    //     n?: number;
+    //     // opTime: result.opTime,
+    //     ok?: number;
+    //     // operationTime,
+    //     deletedCount?: number;
+    // } | null> {
+    //     return this.messageModel.deleteMany({
+    //         'project.id': { $eq: params.project.id },
+    //         'mainEntity.orderNumber': { $exists: true, $eq: params.mainEntity.orderNumber }
+    //     })
+    //         .exec()
+    //         .then((result) => {
+    //             return {
+    //                 // n: result?.n,
+    //                 // opTime: result.opTime,
+    //                 // ok: result?.ok,
+    //                 // operationTime,
+    //                 deletedCount: result?.deletedCount
+    //             };
+    //         });
+    // }
     async unsetUnnecessaryFields(params) {
         return this.messageModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
             .exec();

package/lib/chevre/repo/mongoose/schemas/setting.d.ts

@@ -31,12 +31,6 @@ interface IOnTaskStatusChanged {
 interface IOnEventChanged {
     informEvent2agg?: factory.project.IInformParams[];
 }
-interface IOnTransactionStatusChanged {
-    /**
-     * AggService通知先
-     */
-    informTransaction?: factory.project.IInformParams[];
-}
 export interface IStorageSettings {
     /**
      * 取引保管期間(Confirmed)
@@ -235,7 +229,6 @@ export interface ISetting {
     onResourceUpdated?: {
         informResource?: factory.project.IInformParams[];
     };
-    onTransactionStatusChanged?: IOnTransactionStatusChanged;
     orderNumber?: IOrderNumberSetting;
     project: {
         id: string;

package/lib/chevre/repo/mongoose/schemas/setting.js

@@ -16,7 +16,7 @@ const schemaDefinition = {
     onReservationStatusChanged: mongoose_1.SchemaTypes.Mixed,
     onTaskStatusChanged: mongoose_1.SchemaTypes.Mixed,
     onResourceUpdated: mongoose_1.SchemaTypes.Mixed,
-    onTransactionStatusChanged: mongoose_1.SchemaTypes.Mixed,
+    // onTransactionStatusChanged: SchemaTypes.Mixed, // discontinue(2026-06-29~)
     orderNumber: mongoose_1.SchemaTypes.Mixed,
     quota: mongoose_1.SchemaTypes.Mixed,
     serviceOutputIdentifier: mongoose_1.SchemaTypes.Mixed,

package/lib/chevre/repo/setting.d.ts

@@ -1,7 +1,7 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import { ISetting, IStorageSettings } from './mongoose/schemas/setting';
 type IKeyOfProjection = Exclude<keyof ISetting, 'jwt' | 'project' | 'waiter' | 'integration'>;
-type IGlobalSetting = Pick<ISetting, 'defaultSenderEmail' | 'onEventChanged' | 'onOrderStatusChanged' | 'onReservationStatusChanged' | 'onResourceUpdated' | 'onTaskStatusChanged' | 'onTransactionStatusChanged' | 'orderNumber' | 'quota' | 'serviceOutputIdentifier' | 'storage' | 'transactionNumber' | 'triggerWebhook' | 'useInformResourceTypes' | 'useMongo4confirmationNumberFrom' | 'useMongo4orderNumberFrom' | 'useMongo4transactionNumberFrom' | 'useMongoAsStockHolder' | 'useMongoAsStockHolderProjects' | 'userPoolIdNew' | 'userPoolIdOld'>;
+type IGlobalSetting = Pick<ISetting, 'defaultSenderEmail' | 'onEventChanged' | 'onOrderStatusChanged' | 'onReservationStatusChanged' | 'onResourceUpdated' | 'onTaskStatusChanged' | 'orderNumber' | 'quota' | 'serviceOutputIdentifier' | 'storage' | 'transactionNumber' | 'triggerWebhook' | 'useInformResourceTypes' | 'useMongo4confirmationNumberFrom' | 'useMongo4orderNumberFrom' | 'useMongo4transactionNumberFrom' | 'useMongoAsStockHolder' | 'useMongoAsStockHolderProjects' | 'userPoolIdNew' | 'userPoolIdOld'>;
 export { IGlobalSetting as ISetting };
 /**
  * 設定リポジトリ

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

@@ -38,7 +38,7 @@ const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
-const message_1 = require("../../repo/message");
+// import { MessageRepo } from '../../repo/message';
 const note_1 = require("../../repo/note");
 const order_1 = require("../../repo/order");
 const reservation_1 = require("../../repo/reservation");
@@ -56,7 +56,7 @@ function call(data) {
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
-            message: new message_1.MessageRepo(connection),
+            // message: new MessageRepo(connection),
             note: new note_1.NoteRepo(connection),
             order: new order_1.OrderRepo(connection),
             reservation: new reservation_1.ReservationRepo(connection),

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

@@ -3,7 +3,6 @@ import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AccountingReportRepo } from '../../repo/accountingReport';
 import type { ActionRepo } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
-import type { MessageRepo } from '../../repo/message';
 import type { NoteRepo } from '../../repo/note';
 import type { OrderRepo } from '../../repo/order';
 import type { ReservationRepo } from '../../repo/reservation';
@@ -15,7 +14,6 @@ interface IDeleteTransactionRepos {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
-    message: MessageRepo;
     note: NoteRepo;
     order: OrderRepo;
     reservation: ReservationRepo;

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

@@ -69,7 +69,7 @@ function deleteTransactionById(params) {
         let deleteCancelReservationTransactionResult;
         let deletedReservationNumbers = [];
         let deleteActionResult;
-        let deleteMessagessResult;
+        // let deleteMessagessResult: IDeleteResult | undefined;
         const action = await repos.action.start(actionAttributes);
         try {
             const transactionTypeOf = transaction.typeOf;
@@ -127,11 +127,12 @@ function deleteTransactionById(params) {
                             ]
                         }
                     });
-                    // messages削除(2024-05-01~)
-                    const deleteMessagesByPlaceOrderResult = await deleteMessagesByPlaceOrder({
-                        transaction: params.object
-                    })(repos);
-                    deleteMessagessResult = deleteMessagesByPlaceOrderResult.deleteResult;
+                    // メッセージはcronで定期削除するため取引削除における連動は廃止(2026-06-29~)
+                    // // messages削除(2024-05-01~)
+                    // const deleteMessagesByPlaceOrderResult = await deleteMessagesByPlaceOrder({
+                    //     transaction: params.object
+                    // })(repos);
+                    // deleteMessagessResult = deleteMessagesByPlaceOrderResult.deleteResult;
                     // 取引削除
                     await repos.transaction.findByIdAndDelete({ id: transaction.id });
                     break;
@@ -164,7 +165,7 @@ function deleteTransactionById(params) {
             deleteCancelReservationTransactionResult,
             deletedReservationNumbers,
             deleteActionResult,
-            ...(deleteMessagessResult !== undefined) ? { deleteMessagessResult } : undefined
+            // ...(deleteMessagessResult !== undefined) ? { deleteMessagessResult } : undefined
         };
         await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
     };
@@ -277,24 +278,30 @@ function deletePayTransactionsByPlaceOrder(params) {
         return { deletePayTransactionResult, deleteRefundResult, payTransactionNumbers };
     };
 }
-function deleteMessagesByPlaceOrder(params) {
-    return async (repos) => {
-        let deleteResult;
-        if (params.transaction.typeOf === factory_1.factory.transactionType.PlaceOrder
-            && params.transaction.specifyingMethod === factory_1.factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id) {
-            const orderNumber = params.transaction.object.orderNumber;
-            if (typeof orderNumber === 'string' && orderNumber.length > 0) {
-                const deleteReservationsResult = await repos.message.deleteByMainEntityOrderNumber({
-                    project: { id: params.transaction.project.id },
-                    mainEntity: { orderNumber }
-                });
-                deleteResult = {
-                    n: deleteReservationsResult?.n,
-                    ok: deleteReservationsResult?.ok,
-                    deletedCount: deleteReservationsResult?.deletedCount
-                };
-            }
-        }
-        return { deleteResult };
-    };
-}
+// function deleteMessagesByPlaceOrder(params: {
+//     transaction: factory.task.deleteTransaction.IObject;
+// }) {
+//     return async (repos: {
+//         message: MessageRepo;
+//     }): Promise<{
+//         deleteResult?: IDeleteResult;
+//     }> => {
+//         let deleteResult: IDeleteResult | undefined;
+//         if (params.transaction.typeOf === factory.transactionType.PlaceOrder
+//             && params.transaction.specifyingMethod === factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id) {
+//             const orderNumber = params.transaction.object.orderNumber;
+//             if (typeof orderNumber === 'string' && orderNumber.length > 0) {
+//                 const deleteReservationsResult = await repos.message.deleteByMainEntityOrderNumber({
+//                     project: { id: params.transaction.project.id },
+//                     mainEntity: { orderNumber }
+//                 });
+//                 deleteResult = {
+//                     n: deleteReservationsResult?.n,
+//                     ok: deleteReservationsResult?.ok,
+//                     deletedCount: deleteReservationsResult?.deletedCount
+//                 };
+//             }
+//         }
+//         return { deleteResult };
+//     };
+// }

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

@@ -1,12 +1,11 @@
 import { factory } from '../../../../factory';
 import type { ISetting } from '../../../../repo/setting';
-type IPlaceOrderPotentialTask = factory.task.IAttributes<factory.taskName.PlaceOrder> | factory.task.IAttributes<factory.taskName.TriggerWebhook> | 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.IAttributes<factory.taskName.DeleteTransaction> | factory.task.IAttributes<factory.taskName.VoidPayTransaction> | factory.task.IAttributes<factory.taskName.VoidReserveTransaction>;
 /**
  * 取引のタスクを作成する
  */
 export declare function createTasks(params: {
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'endDate' | 'id' | 'object' | 'project' | 'seller' | 'startDate' | 'status' | 'typeOf'>;
     runsAt: Date;
-    optimizeRedundantTasks: boolean;
-}, setting: Pick<ISetting, 'onTransactionStatusChanged' | 'storage'> | null): IPlaceOrderPotentialTask[];
+}, setting: Pick<ISetting, 'storage'> | null): IPlaceOrderPotentialTask[];
 export {};

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js

@@ -9,53 +9,52 @@ const factory_1 = require("../../../../factory");
 /**
  * 取引のタスクを作成する
  */
-function createTasks(params, setting
-// settings: Settings
-) {
+function createTasks(params, setting) {
     const taskAttributes = [];
     const transaction = params.transaction;
     const taskRunsAt = params.runsAt;
-    const informTransaction = setting?.onTransactionStatusChanged?.informTransaction;
-    const transactionWebhookUrls = (Array.isArray(informTransaction)) ? informTransaction : [];
-    const triggerWebhookTaskAttributes = [];
-    transactionWebhookUrls.forEach(({ recipient }) => {
-        if (typeof recipient?.url === 'string') {
-            const informObject = {
-                id: transaction.id,
-                typeOf: transaction.typeOf,
-                project: transaction.project,
-                seller: transaction.seller,
-                startDate: transaction.startDate,
-                status: transaction.status,
-                ...(transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined
-            };
-            const data = {
-                object: informObject,
-                recipient: {
-                    id: (typeof recipient?.id === 'string') ? recipient.id : '',
-                    name: recipient?.name,
-                    typeOf: factory_1.factory.creativeWorkType.WebApplication
-                    // url: recipient.url // discontinue(2025-02-13~)
-                },
-                target: {
-                    httpMethod: 'POST',
-                    encodingType: factory_1.factory.encodingFormat.Application.json,
-                    typeOf: 'EntryPoint',
-                    urlTemplate: recipient.url
-                }
-            };
-            triggerWebhookTaskAttributes.push({
-                project: transaction.project,
-                name: factory_1.factory.taskName.TriggerWebhook,
-                status: factory_1.factory.taskStatus.Ready,
-                runsAt: taskRunsAt,
-                remainingNumberOfTries: 3,
-                numberOfTried: 0,
-                executionResults: [],
-                data
-            });
-        }
-    });
+    // 取引通知は廃止(2026-06-29~)
+    // const informTransaction = setting?.onTransactionStatusChanged?.informTransaction;
+    // const transactionWebhookUrls = (Array.isArray(informTransaction)) ? informTransaction : [];
+    // const triggerWebhookTaskAttributes: factory.task.IAttributes<factory.taskName.TriggerWebhook>[] = [];
+    // transactionWebhookUrls.forEach(({ recipient }) => {
+    //     if (typeof recipient?.url === 'string') {
+    //         const informObject: factory.notification.transaction.IPlaceOrderAsNotification = {
+    //             id: transaction.id,
+    //             typeOf: transaction.typeOf,
+    //             project: transaction.project,
+    //             seller: transaction.seller,
+    //             startDate: transaction.startDate,
+    //             status: transaction.status,
+    //             ...(transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined
+    //         };
+    //         const data: factory.task.triggerWebhook.IInformAnyResourceAction = {
+    //             object: informObject,
+    //             recipient: {
+    //                 id: (typeof recipient?.id === 'string') ? recipient.id : '',
+    //                 name: recipient?.name,
+    //                 typeOf: factory.creativeWorkType.WebApplication
+    //                 // url: recipient.url // discontinue(2025-02-13~)
+    //             },
+    //             target: {
+    //                 httpMethod: 'POST',
+    //                 encodingType: factory.encodingFormat.Application.json,
+    //                 typeOf: 'EntryPoint',
+    //                 urlTemplate: recipient.url
+    //             }
+    //         };
+    //         triggerWebhookTaskAttributes.push({
+    //             project: transaction.project,
+    //             name: factory.taskName.TriggerWebhook,
+    //             status: factory.taskStatus.Ready,
+    //             runsAt: taskRunsAt,
+    //             remainingNumberOfTries: 3,
+    //             numberOfTried: 0,
+    //             executionResults: [],
+    //             data
+    //         });
+    //     }
+    // });
     const confirmedStoragePeriodInDays = setting?.storage?.transactionConfirmedInDays;
     const canceledStoragePeriodInDays = setting?.storage?.transactionCanceledInDays;
     if (typeof confirmedStoragePeriodInDays !== 'number') {
@@ -140,7 +139,7 @@ function createTasks(params, setting
             purpose: { typeOf: transaction.typeOf, id: transaction.id }
         }
     };
-    taskAttributes.push(...triggerWebhookTaskAttributes, deleteTransactionTask);
+    taskAttributes.push(deleteTransactionTask);
     switch (transaction.status) {
         case factory_1.factory.transactionStatusType.Confirmed: {
             taskAttributes.push(voidReserveTaskAttributes, voidPaymentTaskAttributes);
@@ -182,15 +181,7 @@ function createTasks(params, setting
             taskAttributes.push(voidReserveTaskAttributes, voidPaymentTaskAttributes);
             break;
         case factory_1.factory.transactionStatusType.Expired:
-            // optimizeRedundantTasks(2025-03-)
-            if (params.optimizeRedundantTasks === true) {
-                if (typeof params.transaction.object.orderNumber === 'string') {
-                    taskAttributes.push(voidReserveTaskAttributes, voidPaymentTaskAttributes);
-                }
-            }
-            else {
-                taskAttributes.push(voidReserveTaskAttributes, voidPaymentTaskAttributes);
-            }
+            taskAttributes.push(voidReserveTaskAttributes, voidPaymentTaskAttributes);
             break;
         default:
             throw new factory_1.factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);

package/lib/chevre/service/transaction/placeOrder/exportTasksById.d.ts

@@ -16,9 +16,5 @@ declare function exportTasksById(params: {
      * タスク実行日時バッファ
      */
     runsTasksAfterInSeconds?: number;
-    /**
-     * support optimizeRedundantTasks(2025-03-11~)
-     */
-    optimizeRedundantTasks: boolean;
 }): ITaskAndTransactionOperation<void>;
 export { IExportTasksByIdRepos, exportTasksById };

package/lib/chevre/service/transaction/placeOrder/exportTasksById.js

@@ -26,11 +26,10 @@ function exportTasksById(params) {
                 .toDate();
         }
         // search settings
-        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onTransactionStatusChanged', 'storage']);
+        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['storage']);
         const taskAttributes = (0, factory_2.createTasks)({
             transaction,
-            runsAt: taskRunsAt,
-            optimizeRedundantTasks: params.optimizeRedundantTasks === true
+            runsAt: taskRunsAt
         }, setting
         // settings
         );

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

@@ -28,10 +28,6 @@ export declare function exportOneTransactionTasksIfExists(params: {
      * タスク実行日時バッファ
      */
     runsTasksAfterInSeconds?: number;
-    /**
-     * support optimizeRedundantTasks(2025-03-11~)
-     */
-    optimizeRedundantTasks: boolean;
     status?: {
         $eq?: factory.transactionStatusType;
     };

package/lib/chevre/service/transaction.js

@@ -65,7 +65,7 @@ function exportOneTransactionTasksIfExists(params) {
             case factory_1.factory.transactionType.PlaceOrder:
                 await PlaceOrderTransactionService.exportTasksById({
                     id: transaction.id,
-                    optimizeRedundantTasks: params.optimizeRedundantTasks === true,
+                    // optimizeRedundantTasks: params.optimizeRedundantTasks === true,
                     ...(typeof params.runsTasksAfterInSeconds === 'number')
                         ? { runsTasksAfterInSeconds: params.runsTasksAfterInSeconds }
                         : undefined

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "9.2.0",
+    "@chevre/factory": "9.3.0",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.0.0-alpha.23"
+  "version": "25.0.0-alpha.24"
 }