@chevre/domain 21.34.0-alpha.8 → 21.34.0

package/example/src/chevre/migrateCheckMovieTicketRecipes.ts

@@ -0,0 +1,127 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
+    const cursor = actionRepo.getCursor(
+        {
+            // _id: { $eq: '665c886886e0ee8ff5f7b3c5' },
+            typeOf: { $eq: chevre.factory.actionType.CheckAction },
+            actionStatus: { $eq: chevre.factory.actionStatusType.CompletedActionStatus },
+            startDate: {
+                // $lte: moment()
+                //     // tslint:disable-next-line:no-magic-numbers
+                //     .add(-178, 'days'),
+                $gte: moment()
+                    // tslint:disable-next-line:no-magic-numbers
+                    .add(-365, 'days')
+            },
+            'object.typeOf': { $exists: true, $eq: chevre.factory.service.paymentService.PaymentServiceType.MovieTicket }
+        },
+        {
+            __id: 1, startDate: 1, endDate: 1, result: 1, project: 1, typeOf: 1, actionStatus: 1, instrument: 1
+        }
+    );
+    console.log('actions found');
+
+    let i = 0;
+    let updateCount = 0;
+    let saveRecipeCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const checkAction = <Pick<
+            chevre.factory.action.check.paymentMethod.movieTicket.IAction,
+            'id' | 'startDate' | 'endDate' | 'result' | 'project' | 'typeOf' | 'actionStatus' | 'instrument'
+        >>doc.toObject();
+        const actionRecipe = await actionRepo.findRecipeByAction<chevre.factory.recipe.RecipeCategory.checkMovieTicket>({
+            project: { id: checkAction.project.id },
+            recipeFor: { id: checkAction.id }
+        });
+
+        const purchaseNumberAuthInByCheckAction = (<any>checkAction.result)?.purchaseNumberAuthIn;
+        const purchaseNumberAuthResultByCheckAction = (<any>checkAction.result)?.purchaseNumberAuthResult;
+
+        if (actionRecipe !== null) {
+            console.log(
+                'actionRecipe already exists. step:',
+                actionRecipe.step.length, checkAction.project.id, checkAction.id, checkAction.startDate, i, updateCount, saveRecipeCount);
+
+            // optimize action.result
+            if (purchaseNumberAuthInByCheckAction !== undefined || purchaseNumberAuthResultByCheckAction !== undefined) {
+                const unsetResult = await actionRepo.unsetUnnecessaryFields({
+                    filter: { _id: { $eq: checkAction.id } },
+                    $unset: {
+                        'result.purchaseNumberAuthIn': 1,
+                        'result.purchaseNumberAuthResult': 1
+                    }
+                });
+                updateCount += 1;
+                console.log(
+                    'result unset. unsetResult:', unsetResult,
+                    actionRecipe.step.length, checkAction.project.id, checkAction.id, checkAction.startDate, i);
+            }
+        } else {
+            console.log(
+                'creating recipe by alterTranResultByPayAction',
+                purchaseNumberAuthInByCheckAction?.stCd,
+                purchaseNumberAuthResultByCheckAction?.resultInfo.status,
+                checkAction.project.id, checkAction.id, checkAction.startDate, i);
+            if (purchaseNumberAuthInByCheckAction === undefined) {
+                throw new Error('purchaseNumberAuthInByCheckAction undefined');
+            }
+            if (purchaseNumberAuthResultByCheckAction === undefined) {
+                throw new Error('purchaseNumberAuthResultByCheckAction undefined');
+            }
+
+            const recipe: chevre.factory.action.check.paymentMethod.movieTicket.IRecipe & {
+                recipeFor: { id: string; typeOf: chevre.factory.actionType };
+                dateCreated: Date;
+                dateModified: Date;
+            } = {
+                project: { id: checkAction.project.id, typeOf: chevre.factory.organizationType.Project },
+                typeOf: 'Recipe',
+                recipeCategory: chevre.factory.recipe.RecipeCategory.checkMovieTicket,
+                recipeFor: { id: checkAction.id, typeOf: checkAction.typeOf },
+                step: [{
+                    typeOf: 'HowToSection',
+                    itemListElement: [
+                        {
+                            typeOf: 'HowToStep',
+                            identifier: chevre.factory.recipe.StepIdentifier.purchaseNumberAuth,
+                            itemListElement: [{
+                                typeOf: 'HowToDirection',
+                                beforeMedia: purchaseNumberAuthInByCheckAction,
+                                afterMedia: purchaseNumberAuthResultByCheckAction
+                            }]
+                        }
+                    ]
+                }],
+                dateCreated: moment(checkAction.endDate)
+                    .toDate(),
+                dateModified: moment(checkAction.endDate)
+                    .toDate()
+            };
+            console.log(
+                'saving recipe...',
+                checkAction.project.id, checkAction.id, checkAction.startDate, i);
+            // console.dir(recipe, { depth: null });
+            await actionRepo.saveRecipeWithDateCreated(recipe);
+            saveRecipeCount += 1;
+            console.log('recipe saved.', checkAction.project.id, checkAction.id, checkAction.startDate, i);
+        }
+    });
+
+    console.log(i, 'actions checked');
+    console.log(updateCount, 'actions updated');
+    console.log(saveRecipeCount, 'recipe saved');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/migratePayTransactionRecipes.ts

@@ -0,0 +1,251 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
+    const assetTransactionRepo = await chevre.repository.AssetTransaction.createInstance(mongoose.connection);
+    const cursor = assetTransactionRepo.getCursor(
+        {
+            // transactionNumber: { $eq: '792921546706869' },
+            typeOf: { $eq: chevre.factory.assetTransactionType.Pay },
+            status: { $eq: chevre.factory.transactionStatusType.Confirmed },
+            startDate: {
+                // $lte: moment()
+                //     // tslint:disable-next-line:no-magic-numbers
+                //     .add(-28, 'days'),
+                $gte: moment()
+                    // tslint:disable-next-line:no-magic-numbers
+                    .add(-180, 'days')
+            },
+            'object.typeOf': { $exists: true, $eq: chevre.factory.service.paymentService.PaymentServiceType.CreditCard }
+        },
+        {
+            __id: 1, startDate: 1, object: 1, project: 1, typeOf: 1, status: 1, transactionNumber: 1
+        }
+    );
+    console.log('transactions found');
+
+    let i = 0;
+    let updateCount = 0;
+    let saveRecipeCount = 0;
+    let saveActionCount = 0;
+    // tslint:disable-next-line:max-func-body-length
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const payTransaction = <Pick<
+            chevre.factory.assetTransaction.pay.ITransaction,
+            'id' | 'startDate' | 'object' | 'project' | 'typeOf' | 'status' | 'transactionNumber'
+        >>doc.toObject();
+        let authorizeInvoiceAction: chevre.factory.action.authorize.invoice.IAction | undefined;
+        authorizeInvoiceAction = (<chevre.factory.action.authorize.invoice.IAction[]>await actionRepo.search(
+            {
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: payTransaction.project.id } },
+                agent: {
+                    id: { $in: [payTransaction.project.id] },
+                    typeOf: { $in: [chevre.factory.organizationType.Project] }
+                },
+                object: {
+                    typeOf: { $eq: 'Invoice' },
+                    paymentMethodId: { $eq: payTransaction.transactionNumber }
+                },
+                typeOf: { $eq: chevre.factory.actionType.AuthorizeAction }
+            },
+            [],
+            []
+        )).shift();
+        // authorizeInvoiceAction = undefined;
+
+        const entryTranArgs: chevre.factory.action.authorize.invoice.IEntryTranArgs = (<any>payTransaction.object).entryTranArgs;
+        const entryTranResult: chevre.factory.action.authorize.invoice.IEntryTranResult = (<any>payTransaction.object).entryTranResult;
+        const execTranArgs: chevre.factory.action.authorize.invoice.IExecTranArgs = (<any>payTransaction.object).execTranArgs;
+        const execTranResult: chevre.factory.action.authorize.invoice.IExecTranResult = (<any>payTransaction.object).execTranResult;
+        const secureTran2Result: chevre.factory.action.authorize.invoice.ISecureTran2Result =
+            (<any>payTransaction.object).secureTran2Result;
+
+        if (authorizeInvoiceAction !== undefined) {
+            console.log(
+                'authorizeInvoiceAction already exists. step:',
+                authorizeInvoiceAction.object.paymentMethodId,
+                payTransaction.project.id, payTransaction.transactionNumber, payTransaction.startDate, i
+            );
+
+            const actionRecipe = await actionRepo.findRecipeByAction<chevre.factory.recipe.RecipeCategory.checkMovieTicket>({
+                project: { id: authorizeInvoiceAction.project.id },
+                recipeFor: { id: authorizeInvoiceAction.id }
+            });
+
+            if (actionRecipe !== null) {
+                console.log(
+                    'actionRecipe already exists. step:',
+                    payTransaction.project.id, payTransaction.transactionNumber, payTransaction.startDate, i
+                );
+
+                // optimize payTransaction.object
+                let unsetResult: any;
+                if (secureTran2Result !== undefined) {
+                    // unsetResult = await assetTransactionRepo.unsetUnnecessaryFields({
+                    //     filter: { _id: { $eq: payTransaction.id } },
+                    //     $unset: {
+                    //         'object.secureTran2Result': 1
+                    //     }
+                    // });
+                    updateCount += 1;
+                } else if (entryTranArgs !== undefined && execTranResult !== undefined) {
+                    if (typeof (<any>execTranResult).redirectUrl !== 'string') {
+                        // unsetResult = await assetTransactionRepo.unsetUnnecessaryFields({
+                        //     filter: { _id: { $eq: payTransaction.id } },
+                        //     $unset: {
+                        //         'object.entryTranArgs': 1,
+                        //         'object.entryTranResult': 1,
+                        //         'object.execTranArgs': 1,
+                        //         'object.execTranResult': 1
+                        //     }
+                        // });
+                        updateCount += 1;
+                    }
+                }
+                console.log(
+                    'result unset. unsetResult:', unsetResult,
+                    actionRecipe.step.length,
+                    payTransaction.project.id, payTransaction.transactionNumber, payTransaction.startDate, i
+                );
+            } else {
+                console.log(
+                    'creating recipe...',
+                    payTransaction.project.id, payTransaction.transactionNumber, payTransaction.startDate, i
+                );
+                if (entryTranArgs === undefined) {
+                    throw new Error('entryTranArgs undefined');
+                }
+                if (entryTranResult === undefined) {
+                    throw new Error('entryTranResult undefined');
+                }
+                if (execTranArgs === undefined) {
+                    throw new Error('execTranArgs undefined');
+                }
+                if (execTranResult === undefined) {
+                    throw new Error('execTranResult undefined');
+                }
+
+                let recipe: (chevre.factory.action.authorize.invoice.IAuthorizeInvoiceRecipe
+                    | chevre.factory.action.authorize.invoice.IAuthorizeInvoice3dsRecipe) & {
+                        recipeFor: { id: string; typeOf: chevre.factory.actionType };
+                        dateCreated: Date;
+                        dateModified: Date;
+                    };
+                if (secureTran2Result !== undefined) {
+                    recipe = {
+                        project: { id: payTransaction.project.id, typeOf: chevre.factory.organizationType.Project },
+                        typeOf: 'Recipe',
+                        recipeCategory: chevre.factory.recipe.RecipeCategory.authorizeInvoice3ds,
+                        recipeFor: { id: authorizeInvoiceAction.id, typeOf: authorizeInvoiceAction.typeOf },
+                        step: [{
+                            typeOf: 'HowToSection',
+                            itemListElement: [
+                                {
+                                    typeOf: 'HowToStep',
+                                    identifier: chevre.factory.recipe.StepIdentifier.secureTran2,
+                                    itemListElement: [{
+                                        typeOf: 'HowToDirection',
+                                        afterMedia: secureTran2Result
+                                    }]
+                                }
+                            ]
+                        }],
+                        dateCreated: moment(authorizeInvoiceAction.endDate)
+                            .toDate(),
+                        dateModified: moment(authorizeInvoiceAction.endDate)
+                            .toDate()
+                    };
+                } else {
+                    recipe = {
+                        project: { id: payTransaction.project.id, typeOf: chevre.factory.organizationType.Project },
+                        typeOf: 'Recipe',
+                        recipeCategory: chevre.factory.recipe.RecipeCategory.authorizeInvoice,
+                        recipeFor: { id: authorizeInvoiceAction.id, typeOf: authorizeInvoiceAction.typeOf },
+                        step: [{
+                            typeOf: 'HowToSection',
+                            itemListElement: [
+                                {
+                                    typeOf: 'HowToStep',
+                                    identifier: chevre.factory.recipe.StepIdentifier.entryTran,
+                                    itemListElement: [{
+                                        typeOf: 'HowToDirection',
+                                        beforeMedia: entryTranArgs,
+                                        afterMedia: entryTranResult
+                                    }]
+                                },
+                                {
+                                    typeOf: 'HowToStep',
+                                    identifier: chevre.factory.recipe.StepIdentifier.execTran,
+                                    itemListElement: [{
+                                        typeOf: 'HowToDirection',
+                                        beforeMedia: execTranArgs,
+                                        afterMedia: execTranResult
+                                    }]
+                                }
+                            ]
+                        }],
+                        dateCreated: moment(authorizeInvoiceAction.endDate)
+                            .toDate(),
+                        dateModified: moment(authorizeInvoiceAction.endDate)
+                            .toDate()
+                    };
+                }
+                console.log(
+                    'saving recipe...',
+                    payTransaction.project.id, payTransaction.transactionNumber, payTransaction.startDate, i);
+                // tslint:disable-next-line:no-null-keyword
+                console.dir(recipe, { depth: null });
+                await actionRepo.saveRecipeWithDateCreated(recipe);
+                saveRecipeCount += 1;
+                console.log('recipe saved.', payTransaction.project.id, payTransaction.transactionNumber, payTransaction.startDate, i);
+            }
+        } else {
+            const creatingAction: Omit<chevre.factory.action.authorize.invoice.IAction, 'id'> = {
+                project: { id: payTransaction.project.id, typeOf: chevre.factory.organizationType.Project },
+                typeOf: chevre.factory.actionType.AuthorizeAction,
+                agent: { id: payTransaction.project.id, typeOf: chevre.factory.organizationType.Project },
+                object: {
+                    typeOf: 'Invoice',
+                    paymentMethodId: payTransaction.transactionNumber
+                },
+                startDate: moment(payTransaction.startDate)
+                    .toDate(),
+                endDate: moment(payTransaction.startDate)
+                    .toDate(),
+                actionStatus: chevre.factory.actionStatusType.CompletedActionStatus,
+                result: {},
+                sameAs: { id: payTransaction.id, typeOf: payTransaction.typeOf }
+            };
+            console.log(
+                'creating action...',
+                payTransaction.project.id, payTransaction.transactionNumber, payTransaction.startDate, i
+            );
+            // tslint:disable-next-line:no-null-keyword
+            console.dir(creatingAction, { depth: null });
+            const saveActionResult = await actionRepo.saveActionWithEndDate(creatingAction);
+            saveActionCount += 1;
+            console.log(
+                'action saved.', saveActionResult,
+                payTransaction.project.id, payTransaction.transactionNumber, payTransaction.startDate, i);
+        }
+    });
+
+    console.log(i, 'transactions checked');
+    console.log(updateCount, 'transactions updated');
+    console.log(saveRecipeCount, 'recipe saved');
+    console.log(saveActionCount, 'action saved');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/transaction/processPlaceOrder.ts

@@ -114,7 +114,6 @@ async function main() {
                                 },
                                 options: {
                                     useCancelPayTransactionOnFailed: false,
-                                    useCheckMovieTicketBeforePay: false,
                                     useCheckByIdentifierIfNotYet: false,
                                     useUnlockTransactionProcess: false
                                 }

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

@@ -220,7 +220,7 @@ export declare class MongoRepository {
     updateAuthorizeEventOfferAction(params: {
         id: string;
         object: factory.action.authorize.offer.eventService.IObject<factory.service.webAPI.Identifier.COA>;
-        result: factory.action.authorize.offer.eventService.IResult<factory.service.webAPI.Identifier.COA>;
+        result: factory.action.authorize.offer.eventService.IResult;
     }): Promise<factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier.COA>>;
     updateById(params: {
         id: string;
@@ -303,6 +303,7 @@ export declare class MongoRepository {
     saveRecipeWithDateCreated(savingRecipe: IRecipeAsDocument & {
         dateModified: Date;
     }): Promise<import("mongodb").UpdateResult>;
+    saveActionWithEndDate(savingAction: Omit<factory.action.authorize.invoice.IAction, 'id'>): Promise<import("mongodb").UpdateResult>;
     findRecipeByAction<T extends factory.recipe.RecipeCategory>(params: {
         project: {
             id: string;

package/lib/chevre/repo/action.js

@@ -8,6 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const factory = require("../factory");
@@ -1115,6 +1126,31 @@ class MongoRepository {
                 .exec();
         });
     }
+    saveActionWithEndDate(savingAction) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { typeOf, project, agent, object } = savingAction, updateFields = __rest(savingAction, ["typeOf", "project", "agent", "object"]);
+            const filter = {
+                'project.id': { $eq: project.id },
+                'agent.id': { $exists: true, $eq: agent.id },
+                'object.typeOf': { $exists: true, $eq: object.typeOf },
+                'object.paymentMethodId': { $exists: true, $eq: object.paymentMethodId },
+                typeOf: { $eq: typeOf }
+                // 'sameAs.id': { $exists: true, $eq: sameAs.id }
+            };
+            const setOnInsert = { typeOf, project, agent, object };
+            const setKeys = updateFields;
+            const update = {
+                $setOnInsert: setOnInsert,
+                $set: setKeys
+            };
+            const options = {
+                upsert: true,
+                rawResult: true
+            };
+            return this.actionModel.updateOne(filter, update, options)
+                .exec();
+        });
+    }
     findRecipeByAction(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.actionRecipeModel.findOne({

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

@@ -101,9 +101,6 @@ export declare class MongoRepository {
      * タスク未エクスポートの取引をひとつ取得してエクスポートを開始する
      */
     startExportTasks<T extends factory.assetTransactionType>(params: {
-        project?: {
-            id: string;
-        };
         typeOf?: {
             $in: T[];
         };
@@ -115,13 +112,6 @@ export declare class MongoRepository {
             };
         };
     }): Promise<Pick<factory.assetTransaction.ITransaction<T>, 'id' | 'typeOf'> | null>;
-    /**
-     * タスクエクスポートリトライ
-     * @deprecated use reexportTasksByExportAction
-     */
-    reexportTasksByExportationStatus(params: {
-        intervalInMinutes: number;
-    }): Promise<void>;
     reexportTasksByExportAction(params: {
         intervalInMinutes: number;
     }): Promise<void>;

package/lib/chevre/repo/assetTransaction.js

@@ -409,7 +409,7 @@ class MongoRepository {
      * タスク未エクスポートの取引をひとつ取得してエクスポートを開始する
      */
     startExportTasks(params) {
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             switch (params.status) {
                 case factory.transactionStatusType.InProgress:
@@ -418,7 +418,13 @@ class MongoRepository {
                 // no op
             }
             const typeOfIn = (_a = params.typeOf) === null || _a === void 0 ? void 0 : _a.$in;
-            return this.transactionModel.findOneAndUpdate(Object.assign(Object.assign(Object.assign(Object.assign({}, (typeof ((_b = params.project) === null || _b === void 0 ? void 0 : _b.id) === 'string') ? { 'project.id': { $eq: params.project.id } } : undefined), (Array.isArray(typeOfIn)) ? { typeOf: { $in: typeOfIn } } : undefined), { status: { $eq: params.status }, tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Unexported } }), (typeof params.id === 'string') ? { _id: { $eq: params.id } } : undefined), {
+            return this.transactionModel.findOneAndUpdate(Object.assign(Object.assign(Object.assign({}, (Array.isArray(typeOfIn)) ? { typeOf: { $in: typeOfIn } } : undefined), { status: { $eq: params.status }, 
+                // remove dependency on tasksExportationStatus(2024-06-13~)
+                // tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Unexported },
+                'tasksExportAction.actionStatus': {
+                    $exists: true,
+                    $eq: factory.actionStatusType.PotentialActionStatus
+                } }), (typeof params.id === 'string') ? { _id: { $eq: params.id } } : undefined), {
                 'tasksExportAction.actionStatus': factory.actionStatusType.ActiveActionStatus,
                 'tasksExportAction.agent': { name: params.tasksExportAction.agent.name },
                 'tasksExportAction.startDate': new Date(),
@@ -433,48 +439,6 @@ class MongoRepository {
                 .then((doc) => (doc === null) ? null : doc.toObject());
         });
     }
-    /**
-     * タスクエクスポートリトライ
-     * @deprecated use reexportTasksByExportAction
-     */
-    reexportTasksByExportationStatus(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const reexportingTransactions = yield this.transactionModel.find({
-                tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting },
-                updatedAt: {
-                    $lt: moment()
-                        .add(-params.intervalInMinutes, 'minutes')
-                        .toDate()
-                }
-            })
-                .select({
-                _id: 1,
-                typeOf: 1,
-                status: 1
-            })
-                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-            if (reexportingTransactions.length > 0) {
-                for (const reexportingTransaction of reexportingTransactions) {
-                    yield this.transactionModel.updateOne({
-                        _id: { $eq: reexportingTransaction.id },
-                        tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting }
-                    }, {
-                        tasksExportAction: {
-                            actionStatus: factory.actionStatusType.PotentialActionStatus
-                        },
-                        tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported
-                    })
-                        .exec();
-                    assetTransaction_2.assetTransactionEventEmitter.emitAssetTransactionStatusChanged({
-                        id: reexportingTransaction.id,
-                        typeOf: reexportingTransaction.typeOf,
-                        status: reexportingTransaction.status
-                    });
-                }
-            }
-        });
-    }
     reexportTasksByExportAction(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const reexportingTransactions = yield this.transactionModel.find({
@@ -522,7 +486,12 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const delayedTransactions = yield this.transactionModel.find({
                 status: { $in: params.status.$in },
-                tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Unexported },
+                // remove dependency on tasksExportationStatus(2024-06-13~)
+                // tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Unexported },
+                'tasksExportAction.actionStatus': {
+                    $exists: true,
+                    $eq: factory.actionStatusType.PotentialActionStatus
+                },
                 endDate: {
                     $exists: true,
                     $lt: moment(params.now)
@@ -558,7 +527,12 @@ class MongoRepository {
             const endDate = new Date();
             yield this.transactionModel.updateOne({
                 _id: { $eq: params.id },
-                tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting }
+                // remove dependency on tasksExportationStatus(2024-06-13~)
+                // tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting }
+                'tasksExportAction.actionStatus': {
+                    $exists: true,
+                    $eq: factory.actionStatusType.ActiveActionStatus
+                }
             }, {
                 tasksExportationStatus: factory.transactionTasksExportationStatus.Exported,
                 tasksExportedAt: endDate,

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

@@ -19,6 +19,7 @@ function createStartParams(params) {
         throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
     }
     let totalPaymentDue;
+    let accountId = (_c = params.object.paymentMethod) === null || _c === void 0 ? void 0 : _c.accountId;
     switch (params.paymentServiceType) {
         case factory.service.paymentService.PaymentServiceType.FaceToFace:
             // 対面決済ではとりあえず問答無用にJPY
@@ -34,22 +35,27 @@ function createStartParams(params) {
                 currency: factory.priceCurrency.JPY,
                 value: params.amount
             };
+            accountId = ''; // 強制的に空文字化(2024-06-14~)
             break;
         case factory.service.paymentService.PaymentServiceType.MovieTicket:
-            const specifiedMovieTickets = (_c = params.object.paymentMethod) === null || _c === void 0 ? void 0 : _c.movieTickets;
+            const specifiedMovieTickets = (_d = params.object.paymentMethod) === null || _d === void 0 ? void 0 : _d.movieTickets;
             totalPaymentDue = {
                 typeOf: 'MonetaryAmount',
                 currency: factory.unitCode.C62,
                 value: (Array.isArray(specifiedMovieTickets)) ? specifiedMovieTickets.length : 0
             };
             // MovieTicketIFの決済取引において最大同時着券数を設定可能にする(2023-03-27~)
-            const totalPaymentDueMaxValue = (_f = (_e = (_d = params.paymentService) === null || _d === void 0 ? void 0 : _d.availableChannel) === null || _e === void 0 ? void 0 : _e.totalPaymentDue) === null || _f === void 0 ? void 0 : _f.maxValue;
+            const totalPaymentDueMaxValue = (_g = (_f = (_e = params.paymentService) === null || _e === void 0 ? void 0 : _e.availableChannel) === null || _f === void 0 ? void 0 : _f.totalPaymentDue) === null || _g === void 0 ? void 0 : _g.maxValue;
             const totalPaymentDueValue = totalPaymentDue.value;
             if (typeof totalPaymentDueValue === 'number' && typeof totalPaymentDueMaxValue === 'number') {
                 if (totalPaymentDueValue > totalPaymentDueMaxValue) {
                     throw new factory.errors.Argument('paymentMethod.movieTickets', `Number of movieTickets must be less than or equal to ${totalPaymentDueMaxValue}`);
                 }
             }
+            // 強制的にidentifierで上書き(2024-06-14~)
+            accountId = (Array.isArray(specifiedMovieTickets) && specifiedMovieTickets.length > 0)
+                ? specifiedMovieTickets[0].identifier // 決済カードidentifierは1つのみ許可の前提
+                : '';
             break;
         default:
         // no op
@@ -57,7 +63,6 @@ function createStartParams(params) {
     const informPaymentParams = createInformPaymentParams({
         paymentService: params.paymentService
     });
-    const accountId = (_g = params.object.paymentMethod) === null || _g === void 0 ? void 0 : _g.accountId;
     // currencyはデフォルトでJPY
     let paymentMethodCurrency = factory.priceCurrency.JPY;
     if (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.PaymentCard) {
@@ -84,7 +89,7 @@ function createStartParams(params) {
         currency: paymentMethodCurrency,
         value: params.amount
     };
-    const paymentMethod = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ additionalProperty: (Array.isArray((_p = params.object.paymentMethod) === null || _p === void 0 ? void 0 : _p.additionalProperty))
+    const paymentMethod = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ additionalProperty: (Array.isArray((_p = params.object.paymentMethod) === null || _p === void 0 ? void 0 : _p.additionalProperty))
             ? (_q = params.object.paymentMethod) === null || _q === void 0 ? void 0 : _q.additionalProperty
             : [], name: (typeof ((_r = params.object.paymentMethod) === null || _r === void 0 ? void 0 : _r.name) === 'string')
             ? params.object.paymentMethod.name
@@ -98,6 +103,8 @@ function createStartParams(params) {
         ? { creditCard: (_x = params.object.paymentMethod) === null || _x === void 0 ? void 0 : _x.creditCard }
         : undefined), (Array.isArray((_y = params.object.paymentMethod) === null || _y === void 0 ? void 0 : _y.movieTickets))
         ? { movieTickets: (_z = params.object.paymentMethod) === null || _z === void 0 ? void 0 : _z.movieTickets }
+        : undefined), (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard)
+        ? { paymentMethodId: params.transactionNumber } // 必要ないはずだが互換性維持対応(2024-06-14~)
         : undefined);
     const object = {
         // パラメータから必要なもののみ取り込む