@chevre/domain 21.37.0-alpha.3 → 21.37.0-alpha.5

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

@@ -68,10 +68,7 @@ export declare class MongoRepository {
     addReservations(params: {
         typeOf: factory.assetTransactionType.Reserve;
         id: string;
-        object: Pick<factory.assetTransaction.reserve.IObject, 'acceptedOffer' | 'issuedThrough' | 'reservationFor' | 'subReservation'> & {
-            issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
-            reservationFor: factory.assetTransaction.reserve.IReservationFor;
-        };
+        object: Pick<factory.assetTransaction.reserve.IObject, 'acceptedOffer' | 'subReservation'>;
     }): Promise<void>;
     /**
      * 取引を確定する

package/lib/chevre/repo/assetTransaction.js

@@ -360,8 +360,8 @@ class MongoRepository {
             }, {
                 $set: {
                     'object.acceptedOffer': params.object.acceptedOffer,
-                    'object.issuedThrough': params.object.issuedThrough,
-                    'object.reservationFor': params.object.reservationFor,
+                    // 'object.issuedThrough': params.object.issuedThrough, // start時保管へ移行(2024-07-01~)
+                    // 'object.reservationFor': params.object.reservationFor, // start時保管へ移行(2024-07-01~)
                     'object.subReservation': params.object.subReservation
                 }
             }, { new: false, projection: { _id: 1 } })

package/lib/chevre/service/assetTransaction/refund/potentialActions.js

@@ -50,17 +50,15 @@ function createInformPaymentActions(params) {
                     : String(transaction.agent.id),
                 url: String((_c = a.recipient) === null || _c === void 0 ? void 0 : _c.url)
             };
+            // optimize(2024-07-01~)
             return {
-                project: transaction.project,
-                typeOf: factory.actionType.InformAction,
-                agent: transaction.project,
+                // project: transaction.project,
+                // typeOf: factory.actionType.InformAction,
+                // agent: transaction.project,
                 recipient,
                 // 実際にタスクが生成される直前にactionに置き換える
-                object: {},
-                purpose: {
-                    typeOf: transaction.typeOf,
-                    id: transaction.id
-                }
+                // object: {},
+                purpose: { typeOf: transaction.typeOf, id: transaction.id }
             };
         }));
     }

package/lib/chevre/service/assetTransaction/reserve/factory.d.ts

@@ -3,6 +3,10 @@ import { IMinimizedIndividualEvent } from '../../../factory/event';
 import { IAcceptedAddOn } from './factory/price';
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 export { IAcceptedAddOn };
+type IObject = factory.assetTransaction.reserve.IObject & {
+    issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
+    reservationFor: factory.assetTransaction.reserve.IReservationFor;
+};
 export declare function createStartParams(params: factory.assetTransaction.reserve.IStartParamsWithoutDetail & {
     provider: {
         /**
@@ -12,7 +16,10 @@ export declare function createStartParams(params: factory.assetTransaction.reser
     };
     reservationNumber: string;
     useHoldStockByTransactionNumber: boolean;
-}): factory.assetTransaction.IStartParams<factory.assetTransactionType.Reserve>;
+    event: IMinimizedIndividualEvent<factory.eventType.Event | factory.eventType.ScreeningEvent>;
+}): factory.assetTransaction.IStartParams<factory.assetTransactionType.Reserve> & {
+    object: IObject;
+};
 /**
  * ポイント特典を作成する
  */

package/lib/chevre/service/assetTransaction/reserve/factory.js

@@ -16,7 +16,12 @@ function createStartParams(params) {
         id: params.provider.id,
         typeOf: factory.organizationType.Corporation
     };
-    const reservationPackage = Object.assign({ provider, reservationNumber: reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, 
+    // reservationFor,issuedThrough保管をaddReservationsから移行(2024-07-01~)
+    const reservationFor = createReservationFor(params.event, true);
+    const { issuedThrough } = createIssuedThrough({ reservationFor: params.event });
+    const reservationPackage = Object.assign({ issuedThrough,
+        provider,
+        reservationFor, reservationNumber: reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, 
         // trueで固定(2023-07-19~)
         disablePendingReservations: true, useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, typeOf: factory.reservationType.ReservationPackage }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined);
     return {

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

@@ -57,7 +57,8 @@ function start(params) {
             now,
             store: { id: (_c = params.availableAtOrFrom) === null || _c === void 0 ? void 0 : _c.id }
         });
-        const startParams = (0, factory_1.createStartParams)(Object.assign(Object.assign({}, params), { provider: { id: event.organizer.id }, reservationNumber }));
+        const startParams = (0, factory_1.createStartParams)(Object.assign(Object.assign({}, params), { provider: { id: event.organizer.id }, reservationNumber,
+            event }));
         // 取引作成
         let transaction;
         try {
@@ -84,7 +85,8 @@ function start(params) {
         return {
             transaction: { id: transaction.id },
             objectSubReservations,
-            issuedThrough: addReservationsResult.issuedThrough
+            // issuedThrough: addReservationsResult.issuedThrough
+            issuedThrough: startParams.object.issuedThrough
         };
     });
 }
@@ -137,17 +139,18 @@ function addReservations(params) {
         const availableSeatOffers = yield searchAvailableSeatOffers({ acceptedOffers, event })(repos);
         // 仮予約作成
         const { acceptedOffers4transactionObject, objectSubReservations } = yield createAcceptedOffers4transactionObject({
-            acceptedOffers,
-            ticketOffers,
-            availableOffers, now,
-            event, availableSeatOffers,
-            transaction,
+            acceptedOffers, ticketOffers, availableOffers, now,
+            event, availableSeatOffers, transaction,
             availableAtOrFrom: params.availableAtOrFrom,
             validateAppliesToMovieTicket: params.validateAppliesToMovieTicket
         })(repos);
-        // 予約イベント最適化
-        const reservationFor = (0, factory_1.createReservationFor)(event, true);
-        const { issuedThrough } = (0, factory_1.createIssuedThrough)({ reservationFor: event });
+        // const reservationFor = createReservationFor(event, true);
+        // const { issuedThrough } = createIssuedThrough({ reservationFor: event });
+        const reservationFor = transaction.object.reservationFor;
+        if (reservationFor === undefined) {
+            // 必ずstart時に保管されているはず
+            throw new factory.errors.Internal('transaction.object.reservationFor undefined unexpectedly');
+        }
         // 取引に予約追加
         let lockedOfferRateLimitKeys = [];
         try {
@@ -164,8 +167,8 @@ function addReservations(params) {
                 object: {
                     acceptedOffer: acceptedOffers4transactionObject,
                     // issuedThroughを追加(2023-06-05~)
-                    issuedThrough,
-                    reservationFor,
+                    // issuedThrough, // start時保管へ移行(2024-07-01~)
+                    // reservationFor, // start時保管へ移行(2024-07-01~)
                     subReservation: objectSubReservations
                 }
             });
@@ -198,7 +201,7 @@ function addReservations(params) {
         })(repos);
         // ストックホルダー処理(stockHolderで残席数を集計しているので必要)
         yield onReservationsCreated({ event, transaction: { transactionNumber: transaction.transactionNumber } })(repos);
-        return { objectSubReservations, issuedThrough };
+        return { objectSubReservations };
     });
 }
 /**

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

@@ -26,7 +26,11 @@ declare function lineNotify({ subject, content, imageThumbnail, imageFullsize, l
     imageFullsize?: string;
     logLevel: LineNotifyLogLevel;
 }): ILineNotifyOperation<void>;
-declare function triggerWebhook(params: factory.task.IData<factory.taskName.TriggerWebhook>): (repos: {
+declare function triggerWebhook(params: factory.task.IData<factory.taskName.TriggerWebhook> & {
+    project: {
+        id: string;
+    };
+}): (repos: {
     action: ActionRepo;
     useFetchAPI: boolean;
 }) => Promise<void>;

package/lib/chevre/service/notification.js

@@ -231,11 +231,14 @@ function sleep(waitTime) {
         });
     });
 }
+function createInformActionAttributes(params) {
+    const { object, purpose, recipient, project } = params;
+    return Object.assign({ agent: { id: project.id, typeOf: factory.organizationType.Project }, object, project: { id: project.id, typeOf: factory.organizationType.Project }, recipient, typeOf: factory.actionType.InformAction }, (typeof (purpose === null || purpose === void 0 ? void 0 : purpose.typeOf) === 'string') ? { purpose } : undefined);
+}
 function processInformAction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
-        // アクション開始
-        const action = yield repos.action.start(params);
+        const action = yield repos.action.start(createInformActionAttributes(params));
         let result = {};
         try {
             if (typeof ((_a = params.recipient) === null || _a === void 0 ? void 0 : _a.url) === 'string') {

package/lib/chevre/service/offer/onEventChanged.js

@@ -201,16 +201,16 @@ function createInformTasks(params) {
                     // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
                     delete event4inform._id;
                     const informActionAttributes = {
-                        agent: event4inform.project,
+                        // agent: event4inform.project,
                         object: event4inform,
-                        project: event4inform.project,
+                        // project: event4inform.project,
                         recipient: {
                             id: '',
                             name: String((_a = informEvent.recipient) === null || _a === void 0 ? void 0 : _a.name),
                             typeOf: factory.creativeWorkType.WebApplication,
                             url: informUrl
-                        },
-                        typeOf: factory.actionType.InformAction
+                        }
+                        // typeOf: factory.actionType.InformAction
                     };
                     informTasks.push({
                         project: event4inform.project,

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

@@ -15,16 +15,16 @@ function createInformTasks(order) {
         informTasks = informOrder.map((informOrderParams) => {
             var _a, _b;
             const informActionAttributes = {
-                agent: order.project,
+                // agent: order.project,
                 object: order4inform,
-                project: order.project,
+                // project: order.project,
                 recipient: {
                     url: (_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url,
                     id: recipientId,
                     name: (_b = informOrderParams.recipient) === null || _b === void 0 ? void 0 : _b.name,
                     typeOf: factory.creativeWorkType.WebApplication
-                },
-                typeOf: factory.actionType.InformAction
+                }
+                // typeOf: factory.actionType.InformAction
             };
             return {
                 project: order.project,

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

@@ -19,16 +19,16 @@ function createInformTasks(params) {
         informTasks = informOrder.map((informOrderParams) => {
             var _a, _b;
             const informActionAttributes = {
-                agent: order.project,
+                // agent: order.project,
                 object: order4inform,
-                project: order.project,
+                // project: order.project,
                 recipient: {
                     url: (_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url,
                     id: recipientId,
                     name: (_b = informOrderParams.recipient) === null || _b === void 0 ? void 0 : _b.name,
                     typeOf: factory.creativeWorkType.WebApplication
-                },
-                typeOf: factory.actionType.InformAction
+                }
+                // typeOf: factory.actionType.InformAction
             };
             return {
                 project: order.project,

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

@@ -17,16 +17,16 @@ function createInformTasks(order) {
         informTasks = informOrder.map((informOrderParams) => {
             var _a, _b;
             const informActionAttributes = {
-                agent: order.project,
+                // agent: order.project,
                 object: order4inform,
-                project: order.project,
+                // project: order.project,
                 recipient: {
                     url: (_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url,
                     id: recipientId,
                     name: (_b = informOrderParams.recipient) === null || _b === void 0 ? void 0 : _b.name,
                     typeOf: factory.creativeWorkType.WebApplication
-                },
-                typeOf: factory.actionType.InformAction
+                }
+                // typeOf: factory.actionType.InformAction
             };
             return {
                 project: order.project,

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

@@ -19,16 +19,16 @@ function createInformTasks(order) {
         informTasks = informOrder.map((informOrderParams) => {
             var _a, _b;
             const informActionAttributes = {
-                agent: order.project,
+                // agent: order.project,
                 object: order4inform,
-                project: order.project,
+                // project: order.project,
                 recipient: {
                     url: (_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url,
                     id: recipientId,
                     name: (_b = informOrderParams.recipient) === null || _b === void 0 ? void 0 : _b.name,
                     typeOf: factory.creativeWorkType.WebApplication
-                },
-                typeOf: factory.actionType.InformAction
+                }
+                // typeOf: factory.actionType.InformAction
             };
             return {
                 project: order.project,

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

@@ -14,16 +14,16 @@ function createInformTasks(order) {
         informTasks = informOrder.map((informOrderParams) => {
             var _a, _b;
             const informActionAttributes = {
-                agent: order.project,
+                // agent: order.project,
                 object: order4inform,
-                project: order.project,
+                // project: order.project,
                 recipient: {
                     url: (_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url,
                     id: recipientId,
                     name: (_b = informOrderParams.recipient) === null || _b === void 0 ? void 0 : _b.name,
                     typeOf: factory.creativeWorkType.WebApplication
-                },
-                typeOf: factory.actionType.InformAction
+                }
+                // typeOf: factory.actionType.InformAction
             };
             return {
                 project: order.project,

package/lib/chevre/service/payment/any/onPaid.d.ts

@@ -12,7 +12,5 @@ declare function onPaid(payAction: factory.action.trade.pay.IAction): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     task: TaskRepo;
-}) => Promise<{
-    id: string;
-}[]>;
+}) => Promise<void>;
 export { onPaid };

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

@@ -32,21 +32,24 @@ function onPaid(payAction) {
         }
         const informPayment = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.informPayment;
         if (Array.isArray(informPayment)) {
-            taskAttributes.push(...informPayment.map((a) => {
+            taskAttributes.push(...informPayment.map(({ purpose, recipient }) => {
                 return {
-                    project: a.project,
+                    project: payAction.project,
                     name: factory.taskName.TriggerWebhook,
                     status: factory.taskStatus.Ready,
                     runsAt: now,
                     remainingNumberOfTries: 30,
                     numberOfTried: 0,
                     executionResults: [],
-                    data: Object.assign(Object.assign({}, a), { object: aciton4inform })
+                    data: Object.assign({ 
+                        // optimize(2024-07-01~)
+                        // ...a,
+                        recipient, object: aciton4inform }, (typeof (purpose === null || purpose === void 0 ? void 0 : purpose.typeOf) === 'string') ? { purpose } : undefined)
                 };
             }));
         }
         // タスク保管
-        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.onPaid = onPaid;

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

@@ -90,16 +90,19 @@ function onRefund(refundAction) {
                 }
             }
             if (Array.isArray(informPayment)) {
-                taskAttributes.push(...informPayment.map((a) => {
+                taskAttributes.push(...informPayment.map(({ purpose, recipient }) => {
                     return {
-                        project: a.project,
+                        project: refundAction.project,
                         name: factory.taskName.TriggerWebhook,
                         status: factory.taskStatus.Ready,
                         runsAt: now,
                         remainingNumberOfTries: 30,
                         numberOfTried: 0,
                         executionResults: [],
-                        data: Object.assign(Object.assign({}, a), { object: aciton4inform })
+                        data: Object.assign({ 
+                            // optimize(2024-07-01~)
+                            // ...a,
+                            recipient, object: aciton4inform }, (typeof (purpose === null || purpose === void 0 ? void 0 : purpose.typeOf) === 'string') ? { purpose } : undefined)
                     };
                 }));
             }

package/lib/chevre/service/payment/factory.js

@@ -140,17 +140,15 @@ function createInformPaymentActions(params) {
                     : String(transaction.agent.id),
                 url: String((_c = a.recipient) === null || _c === void 0 ? void 0 : _c.url)
             };
+            // optimize(2024-07-01~)
             return {
-                project: transaction.project,
-                typeOf: factory.actionType.InformAction,
-                agent: transaction.project,
+                // project: transaction.project,
+                // typeOf: factory.actionType.InformAction,
+                // agent: transaction.project,
                 recipient,
                 // 実際にタスクが生成される直前にactionに置き換える
-                object: {},
-                purpose: {
-                    typeOf: transaction.typeOf,
-                    id: transaction.id
-                }
+                // object: {},
+                purpose: { typeOf: transaction.typeOf, id: transaction.id }
             };
         }));
     }

package/lib/chevre/service/reserve/factory.d.ts

@@ -60,6 +60,8 @@ export interface IReservation4informUsed {
 }
 export type IReservation4inform = IReservationPackage4informConfirmed | IReservation4informCanceled | IReservation4informCheckedIn | IReservation4informUsed;
 export type IInformObject = IReservation4inform[];
-export type InformReservationActionattributes = factory.action.interact.inform.IAttributes<IInformObject, any>;
+export interface IPotentialInformReservationAction extends factory.task.triggerWebhook.IPotentialInformAction {
+    object: IInformObject;
+}
 export declare const NUM_TRY_INFORM_RESERVATION: number;
 export {};

package/lib/chevre/service/reserve/potentialActions/onReservationCanceled.js

@@ -55,16 +55,16 @@ reservationFor) {
                         var _a;
                         const informUrl = String((_a = informReservation.recipient) === null || _a === void 0 ? void 0 : _a.url);
                         const informReservationAttributes = {
-                            agent: project,
+                            // agent: project,
                             object: reservations4inform,
-                            project,
+                            // project,
                             recipient: {
                                 id: '',
                                 name: informUrl,
                                 typeOf: factory.creativeWorkType.WebApplication,
                                 url: informUrl
-                            },
-                            typeOf: factory.actionType.InformAction
+                            }
+                            // typeOf: factory.actionType.InformAction
                         };
                         return {
                             project,

package/lib/chevre/service/reserve/potentialActions/onReservationCheckedIn.js

@@ -42,16 +42,16 @@ function onReservationCheckedIn(params) {
                         };
                     });
                     const informReservationAttributes = {
-                        agent: project,
+                        // agent: project,
                         object: reservations4inform,
-                        project,
+                        // project,
                         recipient: {
                             id: '',
                             name: informUrl,
                             typeOf: factory.creativeWorkType.WebApplication,
                             url: informUrl
-                        },
-                        typeOf: factory.actionType.InformAction
+                        }
+                        // typeOf: factory.actionType.InformAction
                     };
                     const informReservationTask = {
                         project,
@@ -76,16 +76,16 @@ function onReservationCheckedIn(params) {
                         };
                     });
                     const informReservationAttributes = {
-                        agent: project,
+                        // agent: project,
                         object: reservations4inform,
-                        project,
+                        // project,
                         recipient: {
                             id: '',
                             name: informUrl,
                             typeOf: factory.creativeWorkType.WebApplication,
                             url: informUrl
-                        },
-                        typeOf: factory.actionType.InformAction
+                        }
+                        // typeOf: factory.actionType.InformAction
                     };
                     const informReservationTask = {
                         project,

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js

@@ -86,16 +86,16 @@ function onReservationConfirmed(confirmedReservations) {
                             : undefined)];
                     const informUrl = String((_a = informReservation.recipient) === null || _a === void 0 ? void 0 : _a.url);
                     const informReservationAttributes = {
-                        agent: project,
+                        // agent: project,
                         object: informObject,
-                        project,
+                        // project,
                         recipient: {
                             id: '',
                             name: informUrl,
                             typeOf: factory.creativeWorkType.WebApplication,
                             url: informUrl
-                        },
-                        typeOf: factory.actionType.InformAction
+                        }
+                        // typeOf: factory.actionType.InformAction
                     };
                     return {
                         project,

package/lib/chevre/service/reserve/potentialActions/onReservationUsed.js

@@ -42,16 +42,16 @@ function onReservationUsed(attendedReservation) {
                 var _a;
                 const informUrl = String((_a = informReservation.recipient) === null || _a === void 0 ? void 0 : _a.url);
                 const informReservationAttributes = {
-                    agent: attendedReservation.project,
+                    // agent: attendedReservation.project,
                     object: [reservation4inform],
-                    project: attendedReservation.project,
+                    // project: attendedReservation.project,
                     recipient: {
                         id: '',
                         name: informUrl,
                         typeOf: factory.creativeWorkType.WebApplication,
                         url: informUrl
-                    },
-                    typeOf: factory.actionType.InformAction
+                    }
+                    // typeOf: factory.actionType.InformAction
                 };
                 return {
                     project: attendedReservation.project,

package/lib/chevre/service/task/onResourceUpdated/onAggregateOfferUpdated.js

@@ -33,16 +33,16 @@ function createInformOfferTasks(params) {
                 offers4inform.forEach((offer4inform) => {
                     var _a;
                     const informActionAttributes = {
-                        agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+                        // agent: { id: params.project.id, typeOf: factory.organizationType.Project },
                         object: offer4inform,
-                        project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                        // project: { id: params.project.id, typeOf: factory.organizationType.Project },
                         recipient: {
                             id: '',
                             name: String((_a = informResource.recipient) === null || _a === void 0 ? void 0 : _a.name),
                             typeOf: factory.creativeWorkType.WebApplication,
                             url: informUrl
-                        },
-                        typeOf: factory.actionType.InformAction
+                        }
+                        // typeOf: factory.actionType.InformAction
                     };
                     informTasks.push({
                         project: { id: params.project.id, typeOf: factory.organizationType.Project },

package/lib/chevre/service/task/onResourceUpdated/onHasPOSUpdated.js

@@ -48,16 +48,16 @@ function createInformHasPOSTasks(params) {
                 movieTheaters4inform.forEach((movieTheater4inform) => {
                     var _a;
                     const informActionAttributes = {
-                        agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+                        // agent: { id: params.project.id, typeOf: factory.organizationType.Project },
                         object: movieTheater4inform,
-                        project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                        // project: { id: params.project.id, typeOf: factory.organizationType.Project },
                         recipient: {
                             id: '',
                             name: String((_a = informResource.recipient) === null || _a === void 0 ? void 0 : _a.name),
                             typeOf: factory.creativeWorkType.WebApplication,
                             url: informUrl
-                        },
-                        typeOf: factory.actionType.InformAction
+                        }
+                        // typeOf: factory.actionType.InformAction
                     };
                     informTasks.push({
                         project: { id: params.project.id, typeOf: factory.organizationType.Project },

package/lib/chevre/service/task/onResourceUpdated/onOfferCatalogUpdated.js

@@ -38,16 +38,16 @@ function createInformOfferCatalogTasks(params) {
                 offerCatalogs4inform.forEach((offerCatalog4inform) => {
                     var _a;
                     const informActionAttributes = {
-                        agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+                        // agent: { id: params.project.id, typeOf: factory.organizationType.Project },
                         object: offerCatalog4inform,
-                        project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                        // project: { id: params.project.id, typeOf: factory.organizationType.Project },
                         recipient: {
                             id: '',
                             name: String((_a = informResource.recipient) === null || _a === void 0 ? void 0 : _a.name),
                             typeOf: factory.creativeWorkType.WebApplication,
                             url: informUrl
-                        },
-                        typeOf: factory.actionType.InformAction
+                        }
+                        // typeOf: factory.actionType.InformAction
                     };
                     informTasks.push({
                         project: { id: params.project.id, typeOf: factory.organizationType.Project },

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

@@ -197,16 +197,16 @@ function createInformNoteTasks(params) {
                     const { about, id, identifier, project, text, typeOf, version } = note4inform;
                     const informObject = { about, id, identifier, project, text, typeOf, version }; // 明示的に必要最低限の属性のみ通知
                     const informActionAttributes = {
-                        agent: project,
+                        // agent: project,
                         object: informObject,
-                        project: project,
+                        // project: project,
                         recipient: {
                             id: '',
                             name: String((_a = informResource.recipient) === null || _a === void 0 ? void 0 : _a.name),
                             typeOf: factory.creativeWorkType.WebApplication,
                             url: informUrl
-                        },
-                        typeOf: factory.actionType.InformAction
+                        }
+                        // typeOf: factory.actionType.InformAction
                     };
                     informTasks.push({
                         project: project,
@@ -243,16 +243,16 @@ function createInformMovieTasks(params) {
                     // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
                     delete movie4inform._id;
                     const informActionAttributes = {
-                        agent: movie4inform.project,
+                        // agent: movie4inform.project,
                         object: movie4inform,
-                        project: movie4inform.project,
+                        // project: movie4inform.project,
                         recipient: {
                             id: '',
                             name: String((_a = informResource.recipient) === null || _a === void 0 ? void 0 : _a.name),
                             typeOf: factory.creativeWorkType.WebApplication,
                             url: informUrl
-                        },
-                        typeOf: factory.actionType.InformAction
+                        }
+                        // typeOf: factory.actionType.InformAction
                     };
                     informTasks.push({
                         project: movie4inform.project,
@@ -289,16 +289,16 @@ function createInformProductTasks(params) {
                     // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
                     delete product4inform._id;
                     const informActionAttributes = {
-                        agent: product4inform.project,
+                        // agent: product4inform.project,
                         object: product4inform,
-                        project: product4inform.project,
+                        // project: product4inform.project,
                         recipient: {
                             id: '',
                             name: String((_a = informResource.recipient) === null || _a === void 0 ? void 0 : _a.name),
                             typeOf: factory.creativeWorkType.WebApplication,
                             url: informUrl
-                        },
-                        typeOf: factory.actionType.InformAction
+                        }
+                        // typeOf: factory.actionType.InformAction
                     };
                     informTasks.push({
                         project: product4inform.project,
@@ -336,16 +336,16 @@ function createInformCategoryCodeTasks(params) {
                     // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
                     delete categoryCode4inform._id;
                     const informActionAttributes = {
-                        agent: categoryCode4inform.project,
+                        // agent: categoryCode4inform.project,
                         object: categoryCode4inform,
-                        project: categoryCode4inform.project,
+                        // project: categoryCode4inform.project,
                         recipient: {
                             id: '',
                             name: String((_a = informResource.recipient) === null || _a === void 0 ? void 0 : _a.name),
                             typeOf: factory.creativeWorkType.WebApplication,
                             url: informUrl
-                        },
-                        typeOf: factory.actionType.InformAction
+                        }
+                        // typeOf: factory.actionType.InformAction
                     };
                     informTasks.push({
                         project: categoryCode4inform.project,
@@ -416,16 +416,16 @@ function createInformMovieTheaterTasks(params) {
                     // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
                     delete movieTheater4inform._id;
                     const informActionAttributes = {
-                        agent: movieTheater4inform.project,
+                        // agent: movieTheater4inform.project,
                         object: movieTheater4inform,
-                        project: movieTheater4inform.project,
+                        // project: movieTheater4inform.project,
                         recipient: {
                             id: '',
                             name: String((_a = informResource.recipient) === null || _a === void 0 ? void 0 : _a.name),
                             typeOf: factory.creativeWorkType.WebApplication,
                             url: informUrl
-                        },
-                        typeOf: factory.actionType.InformAction
+                        }
+                        // typeOf: factory.actionType.InformAction
                     };
                     informTasks.push({
                         project: movieTheater4inform.project,
@@ -480,16 +480,16 @@ function createInformAccountTitleTasks(params) {
                     // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
                     delete accountTitle4inform._id;
                     const informActionAttributes = {
-                        agent: accountTitle4inform.project,
+                        // agent: accountTitle4inform.project,
                         object: accountTitle4inform,
-                        project: accountTitle4inform.project,
+                        // project: accountTitle4inform.project,
                         recipient: {
                             id: '',
                             name: String((_a = informResource.recipient) === null || _a === void 0 ? void 0 : _a.name),
                             typeOf: factory.creativeWorkType.WebApplication,
                             url: informUrl
-                        },
-                        typeOf: factory.actionType.InformAction
+                        }
+                        // typeOf: factory.actionType.InformAction
                     };
                     informTasks.push({
                         project: accountTitle4inform.project,

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

@@ -1,6 +1,6 @@
-import type { IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
 import * as factory from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.triggerWebhook.IData): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.triggerWebhook.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -12,13 +12,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const settings_1 = require("../../settings");
 const action_1 = require("../../repo/action");
-const NotificationService = require("../notification");
+const notification_1 = require("../notification");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        yield NotificationService.triggerWebhook(data)({
+        yield (0, notification_1.triggerWebhook)(Object.assign(Object.assign({}, params.data), { project: { id: params.project.id } }))({
             action: new action_1.MongoRepository(settings.connection),
             useFetchAPI: settings_1.USE_FETCH_API
         });

package/lib/chevre/service/task.js

@@ -116,6 +116,7 @@ function execute(task) {
                 case factory.taskName.ReturnPayTransaction:
                 case factory.taskName.ReturnReserveTransaction:
                 case factory.taskName.SendEmailMessage:
+                case factory.taskName.TriggerWebhook:
                     callResult = yield call(task)(settings, options);
                     break;
                 default:

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

@@ -25,10 +25,8 @@ function createTasks(params) {
             executionResults: [],
             data: {
                 agent: transaction.project,
-                // 通知内容最適化(2022-12-28~)
                 object: informObject,
                 project: transaction.project,
-                purpose: { typeOf: transaction.typeOf, id: transaction.id },
                 recipient: {
                     id: '',
                     name: webhookUrl,

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.377.0-alpha.2",
+    "@chevre/factory": "4.377.0-alpha.3",
     "@cinerino/sdk": "8.0.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.37.0-alpha.3"
+  "version": "21.37.0-alpha.5"
 }