@chevre/domain 22.9.0-alpha.10 → 22.9.0-alpha.11

package/example/src/chevre/migratePaymentServiceInformActionMovieTicket.ts

@@ -0,0 +1,115 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+// const excludedProject = { id: String(process.env.EXCLUDED_PROJECT_ID) };
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const paymentServiceRepo = await chevre.repository.PaymentService.createInstance(mongoose.connection);
+    const potentialActionRepo = await chevre.repository.PotentialAction.createInstance(mongoose.connection);
+
+    const cursor = paymentServiceRepo.getCursor(
+        {
+            typeOf: { $eq: chevre.factory.service.paymentService.PaymentServiceType.MovieTicket }
+            // _id: { $eq: 'cinerino' }
+        },
+        {
+            _id: 1,
+            availableChannel: 1,
+            productID: 1,
+            project: 1,
+            typeOf: 1,
+            potentialAction: 1
+        }
+    );
+    console.log('docs found');
+
+    let i = 0;
+    let updateCount = 0;
+    let recipientUrls: string[] = [];
+    const unexpectedProjectIds: string[] = [];
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const paymentService: Pick<
+            chevre.factory.service.paymentService.IService,
+            'availableChannel' | 'id' | 'productID' | 'project' | 'typeOf' | 'potentialAction'
+        > = doc.toObject();
+
+        console.log(
+            'alreadyMigrated?', paymentService.project.id, i);
+        if (typeof paymentService.id !== 'string') {
+            throw new Error('id must be string');
+        }
+
+        let alreadyMigrated = false;
+        let recipientUrl: string | undefined;
+        let potentialActionId: string | undefined;
+
+        const informPayment = paymentService.availableChannel?.onPaymentStatusChanged?.informPayment;
+        if (Array.isArray(informPayment) && informPayment.length > 0) {
+            recipientUrl = informPayment.at(0)?.recipient?.url;
+        }
+
+        if (typeof recipientUrl === 'string') {
+            recipientUrls.push(recipientUrl);
+
+            const existingAction = (await potentialActionRepo.projectFields(
+                {
+                    project: { id: { $eq: '*' } },
+                    target: { urlTemplate: { $eq: recipientUrl } }
+                },
+                ['target']
+            )).shift();
+            if (existingAction === undefined) {
+                throw new Error('existingAction not found');
+            }
+
+            potentialActionId = existingAction.id;
+            const potentialActionIdByProduct = paymentService.potentialAction?.at(0)?.id;
+            if (potentialActionIdByProduct === existingAction.id) {
+                alreadyMigrated = true;
+                // } else {
+                //     throw new Error('unexpected existingAction');
+            }
+        }
+
+        if (alreadyMigrated) {
+            console.log(
+                'already migrated.', paymentService.project.id, i);
+        } else {
+            if (typeof recipientUrl === 'string' && typeof potentialActionId === 'string') {
+                console.log(
+                    'updating...',
+                    paymentService.project.id, paymentService.productID, recipientUrl, i);
+                await paymentServiceRepo.savePaymentService({
+                    id: String(paymentService.id),
+                    $set: <any>{
+                        typeOf: paymentService.typeOf,
+                        potentialAction: [{ id: potentialActionId, typeOf: chevre.factory.actionType.InformAction }]
+                    },
+                    $unset: {}
+                });
+                updateCount += 1;
+                console.log(
+                    'updated.',
+                    paymentService.project.id, i);
+            }
+        }
+    });
+
+    recipientUrls = [...new Set(recipientUrls)];
+    console.log('unexpectedProjectIds:', unexpectedProjectIds);
+    console.log(recipientUrls);
+    console.log(recipientUrls.length, 'recipientUrls found');
+    console.log(i, 'docs checked');
+    console.log(updateCount, 'docs updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/{migratePaymentServiceContactPointMovieTicket.ts → migratePaymentServicePotentialActions.ts}

@@ -11,6 +11,7 @@ async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const paymentServiceRepo = await chevre.repository.PaymentService.createInstance(mongoose.connection);
+    const potentialActionRepo = await chevre.repository.PotentialAction.createInstance(mongoose.connection);
 
     const cursor = paymentServiceRepo.getCursor(
         {
@@ -50,27 +51,48 @@ async function main() {
         const informPayment = paymentService.availableChannel?.onPaymentStatusChanged?.informPayment;
         if (Array.isArray(informPayment) && informPayment.length > 0) {
             recipientUrl = informPayment.at(0)?.recipient?.url;
-            if (typeof recipientUrl === 'string') {
-                recipientUrls.push(recipientUrl);
-            } else {
-                // throw new Error('serviceUrl must be string');
+        }
+
+        if (typeof recipientUrl === 'string') {
+            recipientUrls.push(recipientUrl);
+
+            const existingActions = await potentialActionRepo.projectFields(
+                {
+                    project: { id: { $eq: '*' } },
+                    target: { urlTemplate: { $eq: recipientUrl } }
+                },
+                ['target']
+            );
+            if (existingActions.length > 0) {
+                alreadyMigrated = true;
             }
-        } else {
-            alreadyMigrated = true;
         }
 
         if (alreadyMigrated) {
             console.log(
                 'already migrated.', paymentService.project.id, i);
         } else {
-            console.log(
-                'updating...',
-                paymentService.project.id, paymentService.productID, recipientUrl, i);
-            // await paymentServiceRepo.saveChannelByServiceUrl(newChannel);
-            updateCount += 1;
-            console.log(
-                'updated.',
-                paymentService.project.id, i);
+            if (typeof recipientUrl === 'string') {
+                const newPotentialAction: Omit<chevre.factory.potentialAction.IPotentialAction, 'id'> = {
+                    identifier: 'inform2surfrock',
+                    project: { id: '*', typeOf: chevre.factory.organizationType.Project },
+                    target: {
+                        httpMethod: 'POST',
+                        encodingType: 'application/json',
+                        typeOf: 'EntryPoint',
+                        urlTemplate: recipientUrl
+                    },
+                    typeOf: chevre.factory.actionType.InformAction
+                };
+                console.log(
+                    'updating...',
+                    paymentService.project.id, paymentService.productID, recipientUrl, i, newPotentialAction);
+                await potentialActionRepo.save({ attributes: newPotentialAction });
+                updateCount += 1;
+                console.log(
+                    'updated.',
+                    paymentService.project.id, i);
+            }
         }
     });
 

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

@@ -25,8 +25,8 @@ const schemaDefinition = {
     // tasksExportedAt: Date, // discontinue(2024-06-19~)
     // tasksExportationStatus: String, // discontinue(2024-06-19~)
     potentialActions: mongoose_1.SchemaTypes.Mixed,
-    // add location(2022-11-11~)
-    location: mongoose_1.SchemaTypes.Mixed
+    location: mongoose_1.SchemaTypes.Mixed,
+    potentialAction: mongoose_1.SchemaTypes.Mixed // add(2025-02-06~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

package/lib/chevre/repo/potentialAction.js

@@ -27,7 +27,8 @@ const potentialAction_1 = require("./mongoose/schemas/potentialAction");
 const AVAILABLE_PROJECT_FIELDS = [
     'project',
     'typeOf',
-    'target'
+    'target',
+    'identifier'
 ];
 /**
  * 潜在アクションリポジトリ

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

@@ -81,9 +81,9 @@ export declare class SellerRepo {
         typeOf: factory.organizationType.Corporation;
         name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         location?: factory.organization.ILocation | undefined;
+        additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
         hasMerchantReturnPolicy?: factory.seller.IHasMerchantReturnPolicy | undefined;
         makesOffer?: factory.seller.IMakesOffer[] | undefined;
-        additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
         telephone?: string | undefined;
         branchCode: string;
         paymentAccepted?: factory.seller.IPaymentAccepted[] | undefined;
@@ -93,9 +93,9 @@ export declare class SellerRepo {
         typeOf: factory.organizationType.Corporation;
         name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         location?: factory.organization.ILocation | undefined;
+        additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
         hasMerchantReturnPolicy?: factory.seller.IHasMerchantReturnPolicy | undefined;
         makesOffer?: factory.seller.IMakesOffer[] | undefined;
-        additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
         telephone?: string | undefined;
         branchCode: string;
         paymentAccepted?: factory.seller.IPaymentAccepted[] | undefined;
@@ -107,9 +107,9 @@ export declare class SellerRepo {
         typeOf: factory.organizationType.Corporation;
         name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         location?: factory.organization.ILocation | undefined;
+        additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
         hasMerchantReturnPolicy?: factory.seller.IHasMerchantReturnPolicy | undefined;
         makesOffer?: factory.seller.IMakesOffer[] | undefined;
-        additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
         telephone?: string | undefined;
         branchCode: string;
         paymentAccepted?: factory.seller.IPaymentAccepted[] | undefined;
@@ -119,9 +119,9 @@ export declare class SellerRepo {
         typeOf: factory.organizationType.Corporation;
         name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         location?: factory.organization.ILocation | undefined;
+        additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
         hasMerchantReturnPolicy?: factory.seller.IHasMerchantReturnPolicy | undefined;
         makesOffer?: factory.seller.IMakesOffer[] | undefined;
-        additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
         telephone?: string | undefined;
         branchCode: string;
         paymentAccepted?: factory.seller.IPaymentAccepted[] | undefined;

package/lib/chevre/service/assetTransaction/fixInformAction.d.ts

@@ -7,5 +7,7 @@ declare function fixInformAction(params: {
     };
 }): (repos: {
     potentialAction: PotentialActionRepo;
-}) => Promise<factory.product.IInformPayment[]>;
+}) => Promise<(factory.product.IInformPayment & {
+    id: string;
+})[]>;
 export { fixInformAction };

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

@@ -18,7 +18,12 @@ function fixInformAction(params) {
         // プロダクト設定を適用
         const informPaymentParamsByProduct = (_c = (_b = (_a = params.paymentService) === null || _a === void 0 ? void 0 : _a.availableChannel) === null || _b === void 0 ? void 0 : _b.onPaymentStatusChanged) === null || _c === void 0 ? void 0 : _c.informPayment;
         if (Array.isArray(informPaymentParamsByProduct)) {
-            informPaymentParams.push(...informPaymentParamsByProduct);
+            informPaymentParams.push(...informPaymentParamsByProduct.map(({ recipient }) => {
+                return {
+                    recipient,
+                    id: ''
+                };
+            }));
         }
         // support potentialAction(2025-02-05~)
         const potentialActionByProduct = (_d = params.paymentService) === null || _d === void 0 ? void 0 : _d.potentialAction;
@@ -35,7 +40,10 @@ function fixInformAction(params) {
                 if (potentialInformAction === undefined) {
                     throw new factory.errors.NotFound(factory.actionType.InformAction);
                 }
-                informPaymentParams = [{ recipient: { url: potentialInformAction.target.urlTemplate } }];
+                informPaymentParams = [{
+                        recipient: { url: potentialInformAction.target.urlTemplate },
+                        id: potentialInformActionId
+                    }];
             }
         }
         return informPaymentParams;

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

@@ -8,7 +8,9 @@ export declare function createStartParams(params: factory.assetTransaction.pay.I
     amount: number;
     paymentService?: Pick<factory.service.paymentService.IService, 'availableChannel' | 'id' | 'serviceOutput' | 'serviceType'> | Pick<factory.product.IProduct, 'availableChannel' | 'id' | 'serviceOutput' | 'serviceType'>;
     location?: factory.action.trade.pay.ILocation;
-    informActions: factory.product.IInformPayment[];
+    informActions: (factory.product.IInformPayment & {
+        id: string;
+    })[];
 }, options: {
     checkedAction: {
         id: string;

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

@@ -109,9 +109,16 @@ function createStartParams(params, options) {
     const object = Object.assign({ accountId: (typeof accountId === 'string') ? accountId : '', paymentMethodId: params.transactionNumber, typeOf: params.paymentServiceType, id: paymentServiceId, onPaymentStatusChanged: { informPayment: params.informActions }, paymentMethod }, (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.MovieTicket)
         ? { checkedAction: { id: options.checkedAction.id } } // add checkedAction(2024-12-13~)
         : undefined);
-    return Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, transactionNumber: params.transactionNumber, typeOf: factory.assetTransactionType.Pay, agent: params.agent, recipient: params.recipient, object, expires: params.expires }, (typeof ((_0 = params.location) === null || _0 === void 0 ? void 0 : _0.typeOf) === 'string')
+    const potentialAction = [];
+    params.informActions.forEach((informAction) => {
+        if (typeof informAction.id === 'string' && informAction.id !== '') {
+            potentialAction.push({ id: informAction.id, typeOf: factory.actionType.InformAction });
+        }
+    });
+    return Object.assign(Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, transactionNumber: params.transactionNumber, typeOf: factory.assetTransactionType.Pay, agent: params.agent, recipient: params.recipient, object, expires: params.expires }, (typeof ((_0 = params.location) === null || _0 === void 0 ? void 0 : _0.typeOf) === 'string')
         ? { location: params.location }
-        : undefined);
+        : undefined), (potentialAction.length > 0) ? { potentialAction } : undefined // add potentialAction(2025-02-05~)
+    );
 }
 // function createInformPaymentParams(params: {
 //     paymentService?: Pick<factory.service.paymentService.IService, 'availableChannel' | 'potentialAction'>;

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

@@ -7,5 +7,7 @@ export declare function createStartParams(params: factory.assetTransaction.refun
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     payAction: factory.action.trade.pay.IAction;
     paymentService?: Pick<factory.product.IProduct, 'availableChannel' | 'typeOf'> | Pick<factory.service.paymentService.IService, 'availableChannel' | 'id' | 'typeOf' | 'serviceOutput'>;
-    informActions: factory.product.IInformPayment[];
+    informActions: (factory.product.IInformPayment & {
+        id: string;
+    })[];
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.Refund>;

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

@@ -36,19 +36,18 @@ function createStartParams(params) {
             }
         }
     }
-    return {
-        project: { typeOf: factory.organizationType.Project, id: params.project.id },
-        transactionNumber: params.transactionNumber,
-        typeOf: factory.assetTransactionType.Refund,
-        agent: params.agent,
-        recipient: params.recipient,
-        object: Object.assign({ accountId: (typeof accountId === 'string') ? accountId : '', paymentMethodId: paymentMethodId, typeOf: params.paymentServiceType, id: (Array.isArray(params.payAction.object) && params.payAction.object.length > 0)
+    const potentialAction = [];
+    params.informActions.forEach((informAction) => {
+        if (typeof informAction.id === 'string' && informAction.id !== '') {
+            potentialAction.push({ id: informAction.id, typeOf: factory.actionType.InformAction });
+        }
+    });
+    return Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, transactionNumber: params.transactionNumber, typeOf: factory.assetTransactionType.Refund, agent: params.agent, recipient: params.recipient, object: Object.assign({ accountId: (typeof accountId === 'string') ? accountId : '', paymentMethodId: paymentMethodId, typeOf: params.paymentServiceType, id: (Array.isArray(params.payAction.object) && params.payAction.object.length > 0)
                 ? params.payAction.object[0].id
                 : '', onPaymentStatusChanged: { informPayment: params.informActions }, paymentMethod: Object.assign({ additionalProperty: (Array.isArray(additionalProperty)) ? additionalProperty : [], name: (typeof name === 'string') ? name : paymentMethodType, paymentMethodId: paymentMethodId, typeOf: paymentMethodType }, (Array.isArray(params.payAction.object) && params.payAction.object.length > 0)
                 ? { totalPaymentDue: params.payAction.object[0].paymentMethod.totalPaymentDue }
-                : undefined) }, (typeof refundFee === 'number') ? { refundFee } : undefined),
-        expires: params.expires
-    };
+                : undefined) }, (typeof refundFee === 'number') ? { refundFee } : undefined), expires: params.expires }, (potentialAction.length > 0) ? { potentialAction } : undefined // add potentialAction(2025-02-05~)
+    );
 }
 // function createInformPaymentParams(params: {
 //     paymentService?: factory.product.IProduct

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

@@ -32,11 +32,12 @@ function createReundActions(params) {
     return refundActions;
 }
 function createInformPaymentActions(params) {
-    var _a;
+    var _a, _b, _c;
     const transaction = params.transaction;
     const informPaymentActions = [];
     // 取引に指定があれば設定
     const informPayment = (_a = transaction.object.onPaymentStatusChanged) === null || _a === void 0 ? void 0 : _a.informPayment;
+    const potentialInformActionId = (_c = (_b = transaction.potentialAction) === null || _b === void 0 ? void 0 : _b.find(({ typeOf }) => typeOf === factory.actionType.InformAction)) === null || _c === void 0 ? void 0 : _c.id;
     if (Array.isArray(informPayment)) {
         informPaymentActions.push(...informPayment.map((a) => {
             var _a, _b, _c;
@@ -51,15 +52,10 @@ function createInformPaymentActions(params) {
                 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,
-                recipient,
+            return Object.assign({ recipient, 
                 // 実際にタスクが生成される直前にactionに置き換える
                 // object: {},
-                purpose: { typeOf: transaction.typeOf, id: transaction.id }
-            };
+                purpose: { typeOf: transaction.typeOf, id: transaction.id } }, (typeof potentialInformActionId === 'string') ? { id: potentialInformActionId } : undefined);
         }));
     }
     return informPaymentActions;

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

@@ -3,6 +3,7 @@ import { SendGridCredentials } from '../credentials/sendGrid';
 import * as factory from '../factory';
 import type { ActionRepo } from '../repo/action';
 import type { MessageRepo } from '../repo/message';
+import type { PotentialActionRepo } from '../repo/potentialAction';
 import type { ProjectRepo } from '../repo/project';
 import type { SettingRepo } from '../repo/setting';
 type ILineNotifyOperation<T> = (repos: undefined, credentials: {
@@ -37,6 +38,7 @@ declare function triggerWebhook(params: factory.task.IData<factory.taskName.Trig
     };
 }): (repos: {
     action: ActionRepo;
+    potentialAction: PotentialActionRepo;
     setting: SettingRepo;
 }) => Promise<void>;
 export { lineNotify, sendEmailMessage, triggerWebhook };

package/lib/chevre/service/notification.js

@@ -189,11 +189,7 @@ function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel
     });
 }
 const USERNAME_ARGUMENT_REQUIRED_MESSAGE = 'Missing required key \'Username\' in params';
-// const TRIGGER_WEBHOOK_MAX_RETRY_COUNT = 2;
-// const TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = 1000;
-function triggerWebhook(params
-// options: IWebhookSettings
-) {
+function triggerWebhook(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['triggerWebhook']);
@@ -242,9 +238,20 @@ function sleep(waitTime) {
     });
 }
 function createInformActionAttributes(params) {
-    const { about, object, purpose, recipient, project } = params;
-    return Object.assign(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), (typeof (about === null || about === void 0 ? void 0 : about.typeOf) === 'string') ? { about } : undefined // add(2025-01-23~)
-    );
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const { about, object, purpose, recipient, project, id } = params;
+        if (typeof id === 'string' && id !== '') {
+            // tslint:disable-next-line:no-suspicious-comment
+            // TODO find target from potentialAction(2025-02-06~)
+            yield repos.potentialAction.projectFields({
+                limit: 1,
+                page: 1,
+                id: { $eq: id }
+            }, ['target']);
+        }
+        return Object.assign(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), (typeof (about === null || about === void 0 ? void 0 : about.typeOf) === 'string') ? { about } : undefined // add(2025-01-23~)
+        );
+    });
 }
 function signRequest(params) {
     const { requestBody, timestamp, secretKey } = params;
@@ -258,12 +265,11 @@ function processInformAction(params, options) {
     // tslint:disable-next-line:cyclomatic-complexity
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f;
-        // const { timeout, useFetchAPI, secretKey, headerIdentifier } = options;
         const timeout = (_a = options === null || options === void 0 ? void 0 : options.triggerWebhook) === null || _a === void 0 ? void 0 : _a.timeout;
         const useFetchAPI = ((_b = options === null || options === void 0 ? void 0 : options.triggerWebhook) === null || _b === void 0 ? void 0 : _b.useFetchAPI) === true;
         const secretKey = (_c = options === null || options === void 0 ? void 0 : options.triggerWebhook) === null || _c === void 0 ? void 0 : _c.secretKey;
         const headerIdentifier = (_d = options === null || options === void 0 ? void 0 : options.triggerWebhook) === null || _d === void 0 ? void 0 : _d.headerIdentifier;
-        const action = yield repos.action.start(createInformActionAttributes(params));
+        const action = yield repos.action.start(yield createInformActionAttributes(params)(repos));
         let result = {};
         try {
             if (typeof ((_e = params.recipient) === null || _e === void 0 ? void 0 : _e.url) === 'string') {

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

@@ -32,7 +32,7 @@ function onPaid(payAction) {
         }
         const informPayment = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.informPayment;
         if (Array.isArray(informPayment)) {
-            taskAttributes.push(...informPayment.map(({ purpose, recipient }) => {
+            taskAttributes.push(...informPayment.map(({ purpose, recipient, id }) => {
                 return {
                     project: payAction.project,
                     name: factory.taskName.TriggerWebhook,
@@ -41,10 +41,10 @@ function onPaid(payAction) {
                     remainingNumberOfTries: 30, // 通知先で429が散見されるので少し多めに
                     numberOfTried: 0,
                     executionResults: [],
-                    data: Object.assign({ 
+                    data: Object.assign(Object.assign({ 
                         // optimize(2024-07-01~)
-                        // ...a,
-                        recipient, object: aciton4inform }, (typeof (purpose === null || purpose === void 0 ? void 0 : purpose.typeOf) === 'string') ? { purpose } : undefined)
+                        recipient, object: aciton4inform }, (typeof (purpose === null || purpose === void 0 ? void 0 : purpose.typeOf) === 'string') ? { purpose } : undefined), (typeof id === 'string') ? { id } : undefined // add potentialAction(2025-02-05~)
+                    )
                 };
             }));
         }

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

@@ -103,7 +103,7 @@ function onRefund(refundAction) {
                 }
             }
             if (Array.isArray(informPayment)) {
-                taskAttributes.push(...informPayment.map(({ purpose, recipient }) => {
+                taskAttributes.push(...informPayment.map(({ purpose, recipient, id }) => {
                     return {
                         project: refundAction.project,
                         name: factory.taskName.TriggerWebhook,
@@ -112,10 +112,10 @@ function onRefund(refundAction) {
                         remainingNumberOfTries: 30, // 通知先で429が散見されるので少し多めに
                         numberOfTried: 0,
                         executionResults: [],
-                        data: Object.assign({ 
+                        data: Object.assign(Object.assign({ 
                             // optimize(2024-07-01~)
-                            // ...a,
-                            recipient, object: aciton4inform }, (typeof (purpose === null || purpose === void 0 ? void 0 : purpose.typeOf) === 'string') ? { purpose } : undefined)
+                            recipient, object: aciton4inform }, (typeof (purpose === null || purpose === void 0 ? void 0 : purpose.typeOf) === 'string') ? { purpose } : undefined), (typeof id === 'string') ? { id } : undefined // add potentialAction(2025-02-05~)
+                        )
                     };
                 }));
             }

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

@@ -4,7 +4,7 @@ import { IAcceptedOfferMovieTicketUsed } from './factory/createPayObjectServiceO
  * 注文に対する決済アクションを生成する
  */
 declare function createPayOrderAction(params: {
-    transaction: Pick<factory.assetTransaction.ITransaction<factory.assetTransactionType.Pay>, 'id' | 'object' | 'transactionNumber' | 'typeOf' | 'agent' | 'project' | 'recipient' | 'location'>;
+    transaction: Pick<factory.assetTransaction.ITransaction<factory.assetTransactionType.Pay>, 'id' | 'object' | 'transactionNumber' | 'typeOf' | 'agent' | 'project' | 'recipient' | 'location' | 'potentialAction'>;
     potentialActions?: factory.assetTransaction.pay.IPotentialActionsParams;
     order: Pick<factory.order.IOrder, 'typeOf' | 'confirmationNumber' | 'orderNumber'> & {
         acceptedOffersMovieTicketUsed: IAcceptedOfferMovieTicketUsed[];

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

@@ -117,11 +117,12 @@ function createPayObject(params) {
     return payObject;
 }
 function createInformPaymentActions(params) {
-    var _a;
+    var _a, _b, _c;
     const transaction = params.transaction;
     const informPaymentActions = [];
     // 取引に指定があれば設定
     const informPayment = (_a = transaction.object.onPaymentStatusChanged) === null || _a === void 0 ? void 0 : _a.informPayment;
+    const potentialInformActionId = (_c = (_b = transaction.potentialAction) === null || _b === void 0 ? void 0 : _b.find(({ typeOf }) => typeOf === factory.actionType.InformAction)) === null || _c === void 0 ? void 0 : _c.id;
     if (Array.isArray(informPayment)) {
         informPaymentActions.push(...informPayment.map((a) => {
             var _a, _b, _c;
@@ -140,15 +141,10 @@ function createInformPaymentActions(params) {
                 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,
-                recipient,
+            return Object.assign({ recipient, 
                 // 実際にタスクが生成される直前にactionに置き換える
                 // object: {},
-                purpose: { typeOf: transaction.typeOf, id: transaction.id }
-            };
+                purpose: { typeOf: transaction.typeOf, id: transaction.id } }, (typeof potentialInformActionId === 'string') ? { id: potentialInformActionId } : undefined);
         }));
     }
     return informPaymentActions;

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

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const action_1 = require("../../repo/action");
+const potentialAction_1 = require("../../repo/potentialAction");
 const setting_1 = require("../../repo/setting");
 const notification_1 = require("../notification");
 /**
@@ -18,10 +19,9 @@ const notification_1 = require("../notification");
  */
 function call(params) {
     return (_a) => __awaiter(this, [_a], void 0, function* ({ connection }) {
-        // const { notification } = settings;
-        // const { timeout, useFetchAPI, secretKey, headerIdentifier } = notification;
         yield (0, notification_1.triggerWebhook)(Object.assign(Object.assign({}, params.data), { project: { id: params.project.id } }))({
             action: new action_1.ActionRepo(connection),
+            potentialAction: new potentialAction_1.PotentialActionRepo(connection),
             setting: new setting_1.SettingRepo(connection)
         });
     });

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.393.0-alpha.6",
-    "@cinerino/sdk": "10.21.0-alpha.7",
+    "@chevre/factory": "4.393.0-alpha.7",
+    "@cinerino/sdk": "10.21.0-alpha.8",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -112,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.9.0-alpha.10"
+  "version": "22.9.0-alpha.11"
 }