@chevre/domain 21.32.0-alpha.9 → 21.32.0

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

@@ -19,25 +19,46 @@ const reservation_1 = require("../../repo/reservation");
 const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
-const EventOfferService = require("../offer/event");
+const transactionProcess_1 = require("../../repo/transactionProcess");
+const event_1 = require("../offer/event");
 /**
  * タスク実行関数
  */
-function call(data) {
-    return (settings) => __awaiter(this, void 0, void 0, function* () {
+function call(params) {
+    // export function call(data: factory.task.IData<factory.taskName.VoidReserveTransaction>): IOperationExecute<void> {
+    return (settings, options) => __awaiter(this, void 0, void 0, function* () {
         if (settings.redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
-        yield EventOfferService.voidTransaction(data)({
-            action: new action_1.MongoRepository(settings.connection),
-            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
-            stockHolder: new stockHolder_1.StockHolderRepository(settings.redisClient, settings.connection),
-            offerRateLimit: new offer_1.RedisRepository(settings.redisClient),
-            orderInTransaction: new orderInTransaction_1.MongoRepository(settings.connection),
-            reservation: new reservation_1.MongoRepository(settings.connection),
-            task: new task_1.MongoRepository(settings.connection),
-            transaction: new transaction_1.MongoRepository(settings.connection)
-        });
+        const voidByActionId = typeof params.data.id === 'string';
+        if (voidByActionId) {
+            // 遅延実行(executeByName)には対応しない
+            if (!options.executeById) {
+                return;
+            }
+        }
+        const transactionProcessRepo = new transactionProcess_1.TransactionProcessRepository(settings.redisClient, { lockExpiresInSeconds: 120 });
+        try {
+            yield (0, event_1.voidTransaction)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } }))({
+                action: new action_1.MongoRepository(settings.connection),
+                assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+                stockHolder: new stockHolder_1.StockHolderRepository(settings.redisClient, settings.connection),
+                offerRateLimit: new offer_1.RedisRepository(settings.redisClient),
+                orderInTransaction: new orderInTransaction_1.MongoRepository(settings.connection),
+                reservation: new reservation_1.MongoRepository(settings.connection),
+                task: new task_1.MongoRepository(settings.connection),
+                transaction: new transaction_1.MongoRepository(settings.connection)
+            });
+        }
+        catch (error) {
+            throw error;
+        }
+        finally {
+            // アクションID指定であれば取引プロセスロック解除(2024-05-26~)
+            if (voidByActionId) {
+                yield transactionProcessRepo.unlock({ typeOf: params.data.purpose.typeOf, id: params.data.purpose.id });
+            }
+        }
     });
 }
 exports.call = call;

package/lib/chevre/service/task.js

@@ -104,10 +104,12 @@ function execute(task) {
             // タスク名の関数が定義されていなければ、TypeErrorとなる
             const { call } = yield Promise.resolve(`${`./task/${task.name}`}`).then(s => require(s));
             switch (task.name) {
+                case factory.taskName.AcceptCOAOffer:
                 case factory.taskName.AuthorizePayment:
                 case factory.taskName.CheckMovieTicket:
                 case factory.taskName.PublishPaymentUrl:
                 case factory.taskName.Refund:
+                case factory.taskName.VoidReserveTransaction:
                     yield call(task)(settings, options);
                     break;
                 default:

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

@@ -1,6 +1,6 @@
 import type { MongoRepository as ActionRepo } from '../../../repo/action';
 import type { AuthorizationRepo } from '../../../repo/code';
-import type { RedisRepository as ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
+import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
 import type { MongoRepository as EmailMessageRepo } from '../../../repo/emailMessage';
 import type { MessageRepo } from '../../../repo/message';
 import type { MongoRepository as OrderInTransactionRepo } from '../../../repo/orderInTransaction';

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

@@ -1,4 +1,4 @@
-import type { RedisRepository as ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
+import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
 import type { MongoRepository as TransactionRepo } from '../../../repo/transaction';
 import * as factory from '../../../factory';
 /**

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.371.0-alpha.1",
-    "@cinerino/sdk": "6.1.0",
+    "@chevre/factory": "4.371.0-alpha.6",
+    "@cinerino/sdk": "7.0.0-alpha.10",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.32.0-alpha.9"
+  "version": "21.32.0"
 }

package/example/src/chevre/migrateAuthorizePaymentActions.ts

@@ -1,75 +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) };
-
-// 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(
-        {
-            typeOf: { $eq: chevre.factory.actionType.AuthorizeAction },
-            'object.typeOf': { $eq: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment },
-            startDate: {
-                $gte: moment()
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(-180, 'days')
-                    .toDate()
-            }
-        },
-        {
-            typeOf: 1,
-            project: 1,
-            instrument: 1,
-            startDate: 1,
-            object: 1
-        }
-    );
-    console.log('actions found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const authorizeAction: Pick<
-            chevre.factory.action.authorize.paymentMethod.any.IAction,
-            'project' | 'typeOf' | 'instrument' | 'startDate' | 'object'
-        > = doc.toObject();
-
-        const alreadyMigrated =
-            authorizeAction.instrument.identifier === chevre.factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre;
-
-        if (alreadyMigrated) {
-            console.log(
-                'already exist.',
-                authorizeAction.project.id,
-                authorizeAction.object.typeOf, authorizeAction.object.paymentMethodId, authorizeAction.startDate, i, updateCount
-            );
-        } else {
-            console.log(
-                'updating...',
-                authorizeAction.project.id,
-                authorizeAction.object.typeOf, authorizeAction.object.paymentMethodId, authorizeAction.startDate, i, updateCount
-            );
-            updateCount += 1;
-            console.log(
-                'updated.',
-                authorizeAction.project.id,
-                authorizeAction.object.typeOf, authorizeAction.object.paymentMethodId, authorizeAction.startDate, i, updateCount
-            );
-        }
-    });
-
-    console.log(i, 'actions checked');
-    console.log(updateCount, 'actions updated');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/lib/chevre/service/offer/event/cancel.js

@@ -1,57 +0,0 @@
-"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.cancel = void 0;
-const factory = require("../../../factory");
-const ReserveTransactionService = require("../../assetTransaction/reserve");
-const any_1 = require("../any");
-/**
- * 興行オファー承認取消(apiから実行)
- * 特定の承認アクションについて処理する
- */
-function cancel(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const transaction = yield repos.transaction.findInProgressById({
-            typeOf: factory.transactionType.PlaceOrder,
-            id: params.transaction.id
-        });
-        if (transaction.agent.id !== params.agent.id) {
-            throw new factory.errors.Forbidden('Transaction not yours');
-        }
-        // MongoDBでcompleteステータスであるにも関わらず、Chevreでは削除されている、というのが最悪の状況
-        // それだけは回避するためにMongoDBを先に変更
-        yield repos.action.cancelWithVoid({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
-        const action = yield repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
-        switch (action.instrument.identifier) {
-            case factory.service.webAPI.Identifier.COA:
-                // 実質使用する予定なしなので廃止(2022-05-12~)
-                throw new factory.errors.NotImplemented(`booking service '${action.instrument.identifier}' not implemented`);
-            default:
-                // add orderInTransaction(2024-01-15~)
-                // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
-                const orderNumberByTransaction = transaction.object.orderNumber;
-                if (typeof orderNumberByTransaction === 'string') {
-                    yield (0, any_1.voidAcceptedOffer)({
-                        // authorizeActions: [action],
-                        authorizeActionsWithInstrument: [action],
-                        orderNumber: orderNumberByTransaction
-                    })(repos);
-                }
-                const transactionNumber = (_a = action.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.transactionNumber;
-                if (typeof transactionNumber === 'string') {
-                    // すでに取消済であったとしても、すべて取消処理(actionStatusに関係なく)
-                    yield ReserveTransactionService.cancel({ transactionNumber })(repos);
-                }
-        }
-    });
-}
-exports.cancel = cancel;