@chevre/domain 21.8.0-alpha.13 → 21.8.0-alpha.15

package/example/src/chevre/migrateOrderPaymentMethodIdentifier.ts

@@ -0,0 +1,82 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+const EXCLUDED_PROJECT_ID = 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 orderRepo = new chevre.repository.Order(mongoose.connection);
+
+    const cursor = orderRepo.getCursor(
+        {
+            // 'project.id': { $eq: project.id },
+            'project.id': { $ne: EXCLUDED_PROJECT_ID },
+            orderDate: {
+                $gte: moment()
+                    // tslint:disable-next-line:no-magic-numbers
+                    .add(-3, 'months')
+                    .toDate()
+            }
+        },
+        {
+            // _id: 1,
+            // project: 1,
+            // location: 1,
+            // superEvent: 1,
+            // startDate: 1,
+            // typeOf: 1,
+            // organizer: 1
+        }
+    );
+    console.log('orders found');
+
+    let i = 0;
+    const updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const order: Pick<
+            chevre.factory.order.IOrder,
+            'orderDate' | 'orderNumber' | 'project'
+        > = doc.toObject();
+
+        const alreadyMigrated = typeof order.orderNumber === 'string';
+
+        if (alreadyMigrated) {
+            console.log('already exist...', order.project.id, order.orderNumber, order.orderDate, i);
+        } else {
+            throw new Error('not implemented');
+            // if (typeof sellerId !== 'string') {
+            //     throw new Error('movieTheater not found');
+            // }
+            // if (typeof sellerId === 'string') {
+            //     const newOrganizer: chevre.factory.event.screeningEventSeries.IOrganizer = {
+            //         id: sellerId
+            //     };
+            //     console.log('updating event...', event.project.id, event.id, event.startDate, i);
+            //     await eventRepo.updatePartiallyById({
+            //         project: { id: event.project.id },
+            //         id: event.id,
+            //         attributes: <any>{
+            //             typeOf: event.typeOf,
+            //             organizer: newOrganizer
+            //         }
+            //     });
+            // updateCount += 1;
+            // console.log('updated.', event.project.id, event.id, event.startDate, i);
+            // }
+        }
+    });
+
+    console.log(i, 'orders checked');
+    console.log(updateCount, 'orders updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -36,8 +36,8 @@ export declare class MongoRepository {
      */
     createDeleteTransactionTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.DeleteTransaction>, options: IOptionOnCreate): Promise<void>;
     createConfirmReserveTransactionTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.ConfirmReserveTransaction>, options: IOptionOnCreate): Promise<void>;
+    createOnAssetTransactionStatusChangedTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.OnAssetTransactionStatusChanged>, options: IOptionOnCreate): Promise<void>;
     createSendOrderTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.SendOrder>, options: IOptionOnCreate): Promise<void>;
-    createOnOrderPaymentCompletedTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.OnOrderPaymentCompleted>, options: IOptionOnCreate): Promise<void>;
     executeById(params: {
         id: string;
         executor: {
@@ -70,7 +70,7 @@ export declare class MongoRepository {
              */
             $nin?: factory.taskName[];
         };
-    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/createEvent").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/syncScreeningRooms").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
+    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/createEvent").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/syncScreeningRooms").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
     retry(params: {
         intervalInMinutes: number;
     }): Promise<void>;

package/lib/chevre/repo/task.js

@@ -244,14 +244,18 @@ class MongoRepository {
             }
         });
     }
-    createSendOrderTaskIfNotExist(params, options) {
+    createOnAssetTransactionStatusChangedTaskIfNotExist(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const createdTask = yield this.taskModel.findOneAndUpdate({
                 'project.id': { $eq: params.project.id },
                 name: { $eq: params.name },
-                'data.object.orderNumber': {
+                'data.object.transactionNumber': {
                     $exists: true,
-                    $eq: String(params.data.object.orderNumber)
+                    $eq: String(params.data.object.transactionNumber)
+                },
+                'data.purpose.orderNumber': {
+                    $exists: true,
+                    $eq: String(params.data.purpose.orderNumber)
                 }
             }, { $setOnInsert: params }, { new: true, upsert: true })
                 .select({ _id: 1 })
@@ -265,7 +269,7 @@ class MongoRepository {
             }
         });
     }
-    createOnOrderPaymentCompletedTaskIfNotExist(params, options) {
+    createSendOrderTaskIfNotExist(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const createdTask = yield this.taskModel.findOneAndUpdate({
                 'project.id': { $eq: params.project.id },
@@ -286,6 +290,32 @@ class MongoRepository {
             }
         });
     }
+    // public async createOnOrderPaymentCompletedTaskIfNotExist(
+    //     params: factory.task.IAttributes<factory.taskName.OnOrderPaymentCompleted>,
+    //     options: IOptionOnCreate
+    // ): Promise<void> {
+    //     const createdTask = await this.taskModel.findOneAndUpdate(
+    //         {
+    //             'project.id': { $eq: params.project.id },
+    //             name: { $eq: params.name },
+    //             'data.object.orderNumber': {
+    //                 $exists: true,
+    //                 $eq: String(params.data.object.orderNumber)
+    //             }
+    //         },
+    //         { $setOnInsert: params },
+    //         { new: true, upsert: true }
+    //     )
+    //         .select({ _id: 1 })
+    //         .exec();
+    //     if (options.emitImmediately) {
+    //         taskEventEmitter.emitTaskStatusChanged({
+    //             id: createdTask.id,
+    //             name: params.name,
+    //             status: factory.taskStatus.Ready
+    //         });
+    //     }
+    // }
     executeById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.taskModel.findOneAndUpdate({

package/lib/chevre/service/order/confirmPayTransaction.d.ts

@@ -1,7 +1,6 @@
 import * as factory from '../../factory';
 import { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import { MongoRepository as ActionRepo } from '../../repo/action';
-import { RedisRepository as RegisterServiceInProgressRepo } from '../../repo/action/registerServiceInProgress';
 import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import { MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as OrderRepo } from '../../repo/order';
@@ -21,6 +20,5 @@ declare function confirmPayTransaction(data: factory.task.IData<factory.taskName
     seller: SellerRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
-    registerServiceInProgress: RegisterServiceInProgressRepo;
 }) => Promise<void>;
 export { confirmPayTransaction };

package/lib/chevre/service/order/confirmPayTransaction.js

@@ -10,10 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmPayTransaction = void 0;
-const createDebug = require("debug");
 const factory = require("../../factory");
 const PayTransactionService = require("../assetTransaction/pay");
-const debug = createDebug('chevre-domain:service:order');
 function confirmPayTransaction(data) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         // アクション開始
@@ -60,11 +58,7 @@ function confirmPayTransaction(data) {
         yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
         // processOrder連携(2023-08-23~)
         yield onConfirmed(data)({
-            assetTransaction: repos.assetTransaction,
-            order: repos.order,
-            registerActionInProgress: repos.registerServiceInProgress,
-            task: repos.task,
-            transaction: repos.transaction
+            task: repos.task
         });
     });
 }
@@ -72,52 +66,33 @@ exports.confirmPayTransaction = confirmPayTransaction;
 function onConfirmed(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         if (params.processOrder === true) {
-            // 注文のpaymentMethodIdを取得
-            const order = yield repos.order.findByOrderNumber({
-                orderNumber: params.purpose.orderNumber,
-                project: { id: params.project.id },
-                inclusion: ['paymentMethods'],
-                exclusion: []
-            });
-            // PayTransactionのステータス検証
-            let allPayTransactionConfirmed = false;
-            const paymentMethodIds = order.paymentMethods.filter((invoice) => typeof invoice.paymentMethodId === 'string' && invoice.paymentMethodId.length > 0)
-                .map((invoice) => invoice.paymentMethodId);
-            if (paymentMethodIds.length > 0) {
-                debug('checking allPayTransactionConfirmed...', 'orderNumber:', params.purpose.orderNumber);
-                const referencedPayTransactions = yield repos.assetTransaction.search({
-                    project: { id: { $eq: params.project.id } },
-                    typeOf: factory.assetTransactionType.Pay,
-                    transactionNumber: { $in: paymentMethodIds }
-                }, ['status']);
-                allPayTransactionConfirmed =
-                    referencedPayTransactions.every((payTransation) => payTransation.status === factory.transactionStatusType.Confirmed);
-                debug('allPayTransactionConfirmed?:', allPayTransactionConfirmed, 'referencedPayTransactions:', JSON.stringify(referencedPayTransactions), 'orderNumber:', params.purpose.orderNumber);
-            }
-            else {
-                allPayTransactionConfirmed = true;
-            }
-            if (allPayTransactionConfirmed) {
-                // onOrderPaymentCompletedタスク冪等作成
-                const onPaymentCompletedTaskData = {
+            for (const confirmingTransaction of params.object) {
+                // タスク冪等作成
+                const onAssetTransactionStatusChangedTaskData = {
                     project: { id: params.project.id, typeOf: factory.organizationType.Project },
                     object: {
+                        typeOf: factory.assetTransactionType.Pay,
+                        transactionNumber: confirmingTransaction.transactionNumber,
+                        status: factory.transactionStatusType.Confirmed
+                    },
+                    purpose: {
                         confirmationNumber: params.purpose.confirmationNumber,
-                        orderNumber: params.purpose.orderNumber
+                        orderNumber: params.purpose.orderNumber,
+                        typeOf: 'Order'
                     },
                     useOnOrderStatusChanged: params.useOnOrderStatusChanged === true
                 };
-                const onPaymentCompletedTaskAttributes = {
+                const onAssetTransactionStatusChangedTask = {
                     project: { id: params.project.id, typeOf: factory.organizationType.Project },
-                    name: factory.taskName.OnOrderPaymentCompleted,
+                    name: factory.taskName.OnAssetTransactionStatusChanged,
                     status: factory.taskStatus.Ready,
                     runsAt: new Date(),
                     remainingNumberOfTries: 10,
                     numberOfTried: 0,
                     executionResults: [],
-                    data: onPaymentCompletedTaskData
+                    data: onAssetTransactionStatusChangedTaskData
                 };
-                yield repos.task.createOnOrderPaymentCompletedTaskIfNotExist(onPaymentCompletedTaskAttributes, { emitImmediately: true });
+                yield repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask, { emitImmediately: true });
             }
         }
     });

package/lib/chevre/service/order/onAssetTransactionStatusChanged.d.ts

@@ -0,0 +1,27 @@
+import { RedisRepository as RegisterServiceInProgressRepo } from '../../repo/action/registerServiceInProgress';
+import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
+import { MongoRepository as OrderRepo } from '../../repo/order';
+import { MongoRepository as TaskRepo } from '../../repo/task';
+import { MongoRepository as TransactionRepo } from '../../repo/transaction';
+import * as factory from '../../factory';
+declare function onAssetTransactionStatusChanged(params: factory.task.IData<factory.taskName.OnAssetTransactionStatusChanged>): (repos: {
+    assetTransaction: AssetTransactionRepo;
+    order: OrderRepo;
+    registerActionInProgress: RegisterServiceInProgressRepo;
+    task: TaskRepo;
+    transaction: TransactionRepo;
+}) => Promise<void>;
+declare function paymentDue2Processing(params: {
+    project: {
+        id: string;
+    };
+    confirmationNumber: string;
+    orderNumber: string;
+    useOnOrderStatusChanged: boolean;
+}): (repos: {
+    order: OrderRepo;
+    registerActionInProgress: RegisterServiceInProgressRepo;
+    task: TaskRepo;
+    transaction: TransactionRepo;
+}) => Promise<void>;
+export { onAssetTransactionStatusChanged, paymentDue2Processing };

package/lib/chevre/service/order/onAssetTransactionStatusChanged.js

@@ -0,0 +1,129 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.paymentDue2Processing = exports.onAssetTransactionStatusChanged = void 0;
+const findPlaceOrderTransaction_1 = require("./findPlaceOrderTransaction");
+const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
+const factory = require("../../factory");
+function onAssetTransactionStatusChanged(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        if (typeof params.useOnOrderStatusChanged !== 'boolean') {
+            throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
+        }
+        switch (params.object.status) {
+            case factory.transactionStatusType.Confirmed:
+                switch (params.object.typeOf) {
+                    case factory.assetTransactionType.Pay:
+                        const orderNumber = (_a = params.purpose) === null || _a === void 0 ? void 0 : _a.orderNumber;
+                        const confirmationNumber = (_b = params.purpose) === null || _b === void 0 ? void 0 : _b.confirmationNumber;
+                        if (typeof orderNumber === 'string' && typeof confirmationNumber === 'string') {
+                            // PayTransactionのステータス検証
+                            const processable = yield isProcessable({ project: { id: params.project.id }, orderNumber })(repos);
+                            if (processable) {
+                                yield paymentDue2Processing({
+                                    project: { id: params.project.id },
+                                    confirmationNumber,
+                                    orderNumber,
+                                    useOnOrderStatusChanged: params.useOnOrderStatusChanged
+                                })(repos);
+                            }
+                        }
+                        break;
+                    default:
+                    // no op
+                }
+                break;
+            default:
+            // no op
+        }
+    });
+}
+exports.onAssetTransactionStatusChanged = onAssetTransactionStatusChanged;
+function isProcessable(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // 注文のpaymentMethodIdを取得
+        const order = yield repos.order.findByOrderNumber({
+            orderNumber: params.orderNumber,
+            project: { id: params.project.id },
+            inclusion: ['paymentMethods'],
+            exclusion: []
+        });
+        // PayTransactionのステータス検証
+        let allPayTransactionConfirmed = false;
+        const paymentMethodIds = order.paymentMethods.filter((invoice) => typeof invoice.paymentMethodId === 'string' && invoice.paymentMethodId.length > 0)
+            .map((invoice) => invoice.paymentMethodId);
+        if (paymentMethodIds.length > 0) {
+            const referencedPayTransactions = yield repos.assetTransaction.search({
+                project: { id: { $eq: params.project.id } },
+                typeOf: factory.assetTransactionType.Pay,
+                transactionNumber: { $in: paymentMethodIds }
+            }, ['status']);
+            allPayTransactionConfirmed =
+                referencedPayTransactions.every((payTransation) => payTransation.status === factory.transactionStatusType.Confirmed);
+        }
+        else {
+            allPayTransactionConfirmed = true;
+        }
+        return allPayTransactionConfirmed;
+    });
+}
+function paymentDue2Processing(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const placeOrderTransaction = yield (0, findPlaceOrderTransaction_1.findPlaceOrderTransaction)({
+            project: { id: params.project.id },
+            confirmationNumber: params.confirmationNumber,
+            orderNumber: params.orderNumber
+        })({ transaction: repos.transaction });
+        let order = yield repos.order.findByOrderNumber({
+            orderNumber: params.orderNumber,
+            project: { id: params.project.id },
+            inclusion: [],
+            exclusion: []
+        });
+        try {
+            order = yield repos.order.changeStatus({
+                project: { id: order.project.id },
+                orderNumber: params.orderNumber,
+                orderStatus: factory.orderStatus.OrderProcessing,
+                previousOrderStatus: factory.orderStatus.OrderPaymentDue
+            });
+        }
+        catch (error) {
+            let throwsError = true;
+            // すでにステータスが煤でいた場合、OrderPaymentDue->OrderProcessingの処理自体は成功しているので、後処理を続行する
+            order = yield repos.order.findByOrderNumber({
+                orderNumber: params.orderNumber,
+                project: { id: params.project.id },
+                inclusion: [],
+                exclusion: []
+            });
+            if (order.orderStatus === factory.orderStatus.OrderDelivered
+                || order.orderStatus === factory.orderStatus.OrderReturned) {
+                throwsError = false;
+            }
+            if (throwsError) {
+                throw error;
+            }
+        }
+        if (params.useOnOrderStatusChanged) {
+            yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({
+                order: Object.assign(Object.assign({}, order), { orderStatus: factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する
+                 }),
+                placeOrderTransaction
+            })({
+                registerActionInProgress: repos.registerActionInProgress,
+                task: repos.task
+            });
+        }
+    });
+}
+exports.paymentDue2Processing = paymentDue2Processing;

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

@@ -30,11 +30,11 @@ export declare function createOnPlaceOrderTasksByTransaction(params: {
  */
 export declare function createOnOrderSentTasksByTransaction(params: {
     potentialActions?: factory.action.transfer.send.order.IPotentialActions;
-}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
+}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
 /**
  * 注文返品後のアクション
  */
 export declare function createOnOrderReturnedTasksByTransaction(params: {
     potentialActions?: factory.action.transfer.returnAction.order.IPotentialActions;
-}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
+}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
 export {};

package/lib/chevre/service/order/payOrder.js

@@ -10,8 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.payOrder = void 0;
-const findPlaceOrderTransaction_1 = require("./findPlaceOrderTransaction");
-const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
+const onAssetTransactionStatusChanged_1 = require("./onAssetTransactionStatusChanged");
 const factory = require("../../factory");
 /**
  * 注文を決済する
@@ -23,52 +22,12 @@ function payOrder(params) {
         }
         const orderNumber = params.object.orderNumber;
         const confirmationNumber = params.object.confirmationNumber;
-        const placeOrderTransaction = yield (0, findPlaceOrderTransaction_1.findPlaceOrderTransaction)({
+        yield (0, onAssetTransactionStatusChanged_1.paymentDue2Processing)({
             project: { id: params.project.id },
             confirmationNumber,
-            orderNumber
-        })({ transaction: repos.transaction });
-        let order = yield repos.order.findByOrderNumber({
             orderNumber,
-            project: { id: params.project.id },
-            inclusion: [],
-            exclusion: []
-        });
-        try {
-            order = yield repos.order.changeStatus({
-                project: { id: order.project.id },
-                orderNumber,
-                orderStatus: factory.orderStatus.OrderProcessing,
-                previousOrderStatus: factory.orderStatus.OrderPaymentDue
-            });
-        }
-        catch (error) {
-            let throwsError = true;
-            // すでにステータスが煤でいた場合、OrderPaymentDue->OrderProcessingの処理自体は成功しているので、後処理を続行する
-            order = yield repos.order.findByOrderNumber({
-                orderNumber: params.object.orderNumber,
-                project: { id: params.project.id },
-                inclusion: [],
-                exclusion: []
-            });
-            if (order.orderStatus === factory.orderStatus.OrderDelivered
-                || order.orderStatus === factory.orderStatus.OrderReturned) {
-                throwsError = false;
-            }
-            if (throwsError) {
-                throw error;
-            }
-        }
-        if (params.useOnOrderStatusChanged) {
-            yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({
-                order: Object.assign(Object.assign({}, order), { orderStatus: factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する
-                 }),
-                placeOrderTransaction
-            })({
-                registerActionInProgress: repos.registerActionInProgress,
-                task: repos.task
-            });
-        }
+            useOnOrderStatusChanged: params.useOnOrderStatusChanged
+        })(repos);
     });
 }
 exports.payOrder = payOrder;

package/lib/chevre/service/order/placeOrder.js

@@ -14,6 +14,7 @@ const moment = require("moment");
 const order_1 = require("../../factory/order");
 const createAccountingReportIfNotExist_1 = require("./createAccountingReportIfNotExist");
 const findPlaceOrderTransaction_1 = require("./findPlaceOrderTransaction");
+const onAssetTransactionStatusChanged_1 = require("./onAssetTransactionStatusChanged");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory = require("../../factory");
 function createOrder(params) {
@@ -246,27 +247,13 @@ function placeOrder(params) {
             }
             // paymentMethods.length: 0の場合を考慮(2023-08-24~)
             if (order.paymentMethods.length === 0) {
-                // paymentMethods.length: 0の場合に、confirmPayTransactionは実行されないので、ここで強制的にpayOrderを実行する必要がある
-                // onOrderPaymentCompletedタスク作成
-                const onPaymentCompletedTaskData = {
-                    project: { id: order.project.id, typeOf: factory.organizationType.Project },
-                    object: {
-                        confirmationNumber: order.confirmationNumber,
-                        orderNumber: order.orderNumber
-                    },
+                // paymentMethods.length: 0の場合に、confirmPayTransactionは実行されないので、ここで強制的にpaymentDue2Processingを実行する必要がある
+                yield (0, onAssetTransactionStatusChanged_1.paymentDue2Processing)({
+                    project: { id: order.project.id },
+                    confirmationNumber: order.confirmationNumber,
+                    orderNumber: order.orderNumber,
                     useOnOrderStatusChanged: params.useOnOrderStatusChanged === true
-                };
-                const onPaymentCompletedTaskAttributes = {
-                    project: { id: order.project.id, typeOf: factory.organizationType.Project },
-                    name: factory.taskName.OnOrderPaymentCompleted,
-                    status: factory.taskStatus.Ready,
-                    runsAt: new Date(),
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: onPaymentCompletedTaskData
-                };
-                yield repos.task.createOnOrderPaymentCompletedTaskIfNotExist(onPaymentCompletedTaskAttributes, { emitImmediately: true });
+                })(repos);
             }
         }
         // onOrderStatusChangedへ移行(2023-08-17~)

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

@@ -3,9 +3,10 @@
  */
 import { confirmPayTransaction } from './order/confirmPayTransaction';
 import { deleteOrder } from './order/deleteOrder';
+import { onAssetTransactionStatusChanged, paymentDue2Processing } from './order/onAssetTransactionStatusChanged';
 import { onOrderStatusChanged } from './order/onOrderStatusChanged';
 import { onOrderUpdated } from './order/onOrderUpdated';
 import { payOrder } from './order/payOrder';
 import { placeOrder, placeOrderWithoutTransaction } from './order/placeOrder';
 import { sendOrder } from './order/sendOrder';
-export { confirmPayTransaction, deleteOrder, onOrderStatusChanged, onOrderUpdated, payOrder, placeOrder, placeOrderWithoutTransaction, sendOrder };
+export { confirmPayTransaction, deleteOrder, onAssetTransactionStatusChanged, onOrderStatusChanged, onOrderUpdated, paymentDue2Processing, payOrder, placeOrder, placeOrderWithoutTransaction, sendOrder };

package/lib/chevre/service/order.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendOrder = exports.placeOrderWithoutTransaction = exports.placeOrder = exports.payOrder = exports.onOrderUpdated = exports.onOrderStatusChanged = exports.deleteOrder = exports.confirmPayTransaction = void 0;
+exports.sendOrder = exports.placeOrderWithoutTransaction = exports.placeOrder = exports.payOrder = exports.paymentDue2Processing = exports.onOrderUpdated = exports.onOrderStatusChanged = exports.onAssetTransactionStatusChanged = exports.deleteOrder = exports.confirmPayTransaction = void 0;
 /**
  * 注文サービス
  */
@@ -8,6 +8,9 @@ const confirmPayTransaction_1 = require("./order/confirmPayTransaction");
 Object.defineProperty(exports, "confirmPayTransaction", { enumerable: true, get: function () { return confirmPayTransaction_1.confirmPayTransaction; } });
 const deleteOrder_1 = require("./order/deleteOrder");
 Object.defineProperty(exports, "deleteOrder", { enumerable: true, get: function () { return deleteOrder_1.deleteOrder; } });
+const onAssetTransactionStatusChanged_1 = require("./order/onAssetTransactionStatusChanged");
+Object.defineProperty(exports, "onAssetTransactionStatusChanged", { enumerable: true, get: function () { return onAssetTransactionStatusChanged_1.onAssetTransactionStatusChanged; } });
+Object.defineProperty(exports, "paymentDue2Processing", { enumerable: true, get: function () { return onAssetTransactionStatusChanged_1.paymentDue2Processing; } });
 const onOrderStatusChanged_1 = require("./order/onOrderStatusChanged");
 Object.defineProperty(exports, "onOrderStatusChanged", { enumerable: true, get: function () { return onOrderStatusChanged_1.onOrderStatusChanged; } });
 const onOrderUpdated_1 = require("./order/onOrderUpdated");

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

@@ -13,7 +13,6 @@ exports.call = void 0;
 const factory = require("../../factory");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
-const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
@@ -41,8 +40,7 @@ function call(data) {
             project: new project_1.MongoRepository(settings.connection),
             seller: new seller_1.MongoRepository(settings.connection),
             task: new task_1.MongoRepository(settings.connection),
-            transaction: new transaction_1.MongoRepository(settings.connection),
-            registerServiceInProgress: new registerServiceInProgress_1.RedisRepository(settings.redisClient)
+            transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });
 }

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

@@ -0,0 +1,6 @@
+import { IOperation } from '../task';
+import * as factory from '../../factory';
+/**
+ * タスク実行関数
+ */
+export declare function call(data: factory.task.IData<factory.taskName.OnAssetTransactionStatusChanged>): IOperation<void>;

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

@@ -0,0 +1,37 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.call = void 0;
+const factory = require("../../factory");
+const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
+const assetTransaction_1 = require("../../repo/assetTransaction");
+const order_1 = require("../../repo/order");
+const task_1 = require("../../repo/task");
+const transaction_1 = require("../../repo/transaction");
+const onAssetTransactionStatusChanged_1 = require("../order/onAssetTransactionStatusChanged");
+/**
+ * タスク実行関数
+ */
+function call(data) {
+    return (settings) => __awaiter(this, void 0, void 0, function* () {
+        if (settings.redisClient === undefined) {
+            throw new factory.errors.Argument('settings', 'redisClient required');
+        }
+        yield (0, onAssetTransactionStatusChanged_1.onAssetTransactionStatusChanged)(data)({
+            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+            order: new order_1.MongoRepository(settings.connection),
+            registerActionInProgress: new registerServiceInProgress_1.RedisRepository(settings.redisClient),
+            task: new task_1.MongoRepository(settings.connection),
+            transaction: new transaction_1.MongoRepository(settings.connection)
+        });
+    });
+}
+exports.call = call;

package/lib/chevre/service/transaction/placeOrderInProgress/result.js

@@ -73,15 +73,27 @@ function createPaymentMethods(params) {
         var _a, _b, _c;
         const result = a.result;
         const paymentMethodAmountCurrencyByAuthorizeAction = (_b = (_a = result.paymentMethodAsObject) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency;
-        const paymentMethodOfInvoice = (typeof paymentMethodAmountCurrencyByAuthorizeAction === 'string') ?
-            { amount: { currency: paymentMethodAmountCurrencyByAuthorizeAction } }
-            : undefined;
         // 決済方法区分は必ず存在するはず(2023-08-15~)
         const paymentMethodType = (_c = result.paymentMethodAsObject) === null || _c === void 0 ? void 0 : _c.typeOf;
         if (typeof paymentMethodType !== 'string') {
             throw new factory.errors.NotFound('authorizePaymentAction.result.paymentMethodAsObject.typeOf');
         }
-        paymentMethods.push(Object.assign({ accountId: result.accountId, additionalProperty: (Array.isArray(result.additionalProperty)) ? result.additionalProperty : [], issuedThrough: result.issuedThrough, name: result.name, paymentMethodId: result.paymentMethodId, paymentStatus: result.paymentStatus, totalPaymentDue: result.totalPaymentDue, typeOf: paymentMethodType }, (paymentMethodOfInvoice !== undefined) ? { paymentMethod: paymentMethodOfInvoice } : undefined));
+        const paymentMethodOfInvoice = Object.assign({ identifier: paymentMethodType }, (typeof paymentMethodAmountCurrencyByAuthorizeAction === 'string') ?
+            { amount: { currency: paymentMethodAmountCurrencyByAuthorizeAction } }
+            : undefined);
+        paymentMethods.push({
+            accountId: result.accountId,
+            additionalProperty: (Array.isArray(result.additionalProperty)) ? result.additionalProperty : [],
+            issuedThrough: result.issuedThrough,
+            name: result.name,
+            paymentMethodId: result.paymentMethodId,
+            paymentStatus: result.paymentStatus,
+            totalPaymentDue: result.totalPaymentDue,
+            typeOf: paymentMethodType,
+            // CreditCardIFのカード通貨区分を追加(2023-08-15~)
+            // 決済方法区分を保証(2023-08-28~)
+            paymentMethod: paymentMethodOfInvoice
+        });
     });
     // 決済方法から注文金額の計算
     // price += authorizePaymentActions

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.327.0-alpha.3",
+    "@chevre/factory": "4.327.0-alpha.5",
     "@cinerino/sdk": "3.165.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.8.0-alpha.13"
+  "version": "21.8.0-alpha.15"
 }

package/example/src/chevre/migrateEventOrganizer.ts

@@ -1,154 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-const EXCLUDED_PROJECT_ID = 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 eventRepo = new chevre.repository.Event(mongoose.connection);
-    const placeRepo = new chevre.repository.Place(mongoose.connection);
-
-    const cursor = eventRepo.getCursor(
-        {
-            // 'project.id': { $eq: project.id },
-            'project.id': { $ne: EXCLUDED_PROJECT_ID },
-            typeOf: {
-                $in: [
-                    // chevre.factory.eventType.ScreeningEvent,
-                    chevre.factory.eventType.ScreeningEventSeries
-                ]
-            },
-            organizer: { $exists: true },
-            startDate: {
-                $gte: moment()
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(-3, 'months')
-                    .toDate()
-            }
-        },
-        {
-            _id: 1,
-            project: 1,
-            location: 1,
-            superEvent: 1,
-            startDate: 1,
-            typeOf: 1,
-            organizer: 1
-        }
-    );
-    console.log('events found');
-
-    let i = 0;
-    let updateCount = 0;
-    let invalidOrganizerCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const event: Pick<
-            chevre.factory.event.IEvent<chevre.factory.eventType.ScreeningEvent>,
-            'id' | 'project' | 'location' | 'startDate' | 'typeOf' | 'organizer' | 'superEvent'
-        > | Pick<
-            chevre.factory.event.IEvent<chevre.factory.eventType.ScreeningEventSeries>,
-            'id' | 'project' | 'location' | 'startDate' | 'typeOf' | 'organizer'
-        > = doc.toObject();
-
-        const organizerId = event.organizer?.id;
-
-        let movieTheaterId: string;
-        let movieTheaterBranchCode: string;
-        if (event.typeOf === chevre.factory.eventType.ScreeningEventSeries) {
-            movieTheaterId = event.location.id;
-            movieTheaterBranchCode = event.location.branchCode;
-        } else {
-            movieTheaterId = event.superEvent.location.id;
-            movieTheaterBranchCode = event.superEvent.location.branchCode;
-        }
-        const movieTheaters = <Pick<
-            chevre.factory.place.movieTheater.IPlaceWithoutScreeningRoom,
-            'parentOrganization' | 'branchCode'
-        >[]>
-            await placeRepo.searchMovieTheaters(
-                {
-                    limit: 1,
-                    page: 1,
-                    project: { id: { $eq: event.project.id } },
-                    id: { $eq: movieTheaterId }
-                },
-                ['parentOrganization', 'branchCode'],
-                []
-            );
-        const movieTheater = movieTheaters.shift();
-        const sellerId = movieTheater?.parentOrganization?.id;
-        console.log(
-            'movieTheater found',
-            event.project.id, event.id, event.startDate, 'sellerId:', sellerId,
-            'movieTheaterId:', movieTheaterId,
-            'movieTheaterBranchCode:', movieTheaterBranchCode,
-            i
-        );
-
-        const alreadyMigrated = typeof organizerId === 'string';
-
-        if (alreadyMigrated) {
-            console.log('already exist...', event.project.id, event.id, event.startDate, organizerId, i);
-            if (organizerId === sellerId) {
-                console.log('organizerId is valid', event.project.id, event.id, event.startDate, organizerId, i);
-            } else {
-                invalidOrganizerCount += 1;
-
-                // organizerを修正する
-                if (typeof sellerId !== 'string') {
-                    throw new Error('movieTheater not found');
-                }
-                const fixedOrganizer: chevre.factory.event.screeningEventSeries.IOrganizer = {
-                    id: sellerId
-                };
-                console.log('updating event...', event.project.id, event.id, event.startDate, i);
-                await eventRepo.updatePartiallyById({
-                    project: { id: event.project.id },
-                    id: event.id,
-                    attributes: <any>{
-                        typeOf: event.typeOf,
-                        organizer: fixedOrganizer
-                    }
-                });
-                updateCount += 1;
-                console.log('updated.', event.project.id, event.id, event.startDate, i);
-            }
-        } else {
-            throw new Error('organizer not found');
-            // if (typeof sellerId !== 'string') {
-            //     throw new Error('movieTheater not found');
-            // }
-            // if (typeof sellerId === 'string') {
-            //     const newOrganizer: chevre.factory.event.screeningEventSeries.IOrganizer = {
-            //         id: sellerId
-            //     };
-            //     console.log('updating event...', event.project.id, event.id, event.startDate, i);
-            //     await eventRepo.updatePartiallyById({
-            //         project: { id: event.project.id },
-            //         id: event.id,
-            //         attributes: <any>{
-            //             typeOf: event.typeOf,
-            //             organizer: newOrganizer
-            //         }
-            //     });
-            //     updateCount += 1;
-            //     console.log('updated.', event.project.id, event.id, event.startDate, i);
-            // }
-        }
-    });
-
-    console.log(i, 'events checked');
-    console.log(updateCount, 'events updated');
-    console.log(invalidOrganizerCount, 'invalid');
-}
-
-main()
-    .then()
-    .catch(console.error);