@chevre/domain 21.33.0-alpha.10 → 21.33.0-alpha.12

package/example/src/chevre/reexportTasksByExportAction.ts

@@ -0,0 +1,37 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+function onTransactionStatusChangedListener() {
+    return async (params: {
+        /**
+         * 取引ID
+         */
+        id: string;
+        typeOf: chevre.factory.transactionType;
+        status: chevre.factory.transactionStatusType;
+    }) => {
+        const { id, typeOf, status } = params;
+        console.log('transactionStatusChanged.', id, typeOf, status);
+    };
+}
+
+chevre.eventEmitter.transaction.onTransactionStatusChanged(onTransactionStatusChangedListener());
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const transactionRepo = await chevre.repository.Transaction.createInstance(mongoose.connection);
+
+    const result = await transactionRepo.reexportTasksByExportAction({
+        intervalInMinutes: 10
+    });
+    console.log('reexported', result);
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -158,9 +158,12 @@ export declare class MongoRepository {
     }): Promise<Pick<factory.transaction.ITransaction<T>, 'id' | 'typeOf'> | null>;
     /**
      * タスクエクスポートリトライ
-     * TODO updatedAtを基準にしているが、タスクエクスポートトライ日時を持たせた方が安全か？
+     * @deprecated use reexportTasksByExportAction
      */
-    reexportTasks(params: {
+    reexportTasksByExportationStatus(params: {
+        intervalInMinutes: number;
+    }): Promise<void>;
+    reexportTasksByExportAction(params: {
         intervalInMinutes: number;
     }): Promise<void>;
     /**

package/lib/chevre/repo/transaction.js

@@ -548,12 +548,11 @@ class MongoRepository {
                 .then((doc) => (doc === null) ? null : doc.toObject());
         });
     }
-    // tslint:disable-next-line:no-suspicious-comment
     /**
      * タスクエクスポートリトライ
-     * TODO updatedAtを基準にしているが、タスクエクスポートトライ日時を持たせた方が安全か？
+     * @deprecated use reexportTasksByExportAction
      */
-    reexportTasks(params) {
+    reexportTasksByExportationStatus(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const reexportingTransactions = yield this.transactionModel.find({
                 tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting },
@@ -591,6 +590,46 @@ class MongoRepository {
             }
         });
     }
+    reexportTasksByExportAction(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const reexportingTransactions = yield this.transactionModel.find({
+                'tasksExportAction.actionStatus': {
+                    $exists: true,
+                    $eq: factory.actionStatusType.ActiveActionStatus
+                },
+                'tasksExportAction.startDate': {
+                    $exists: true,
+                    $lt: moment()
+                        .add(-params.intervalInMinutes, 'minutes')
+                        .toDate()
+                }
+            }, { _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 },
+                        'tasksExportAction.actionStatus': {
+                            $exists: true,
+                            $eq: factory.actionStatusType.ActiveActionStatus
+                        }
+                    }, {
+                        tasksExportAction: {
+                            actionStatus: factory.actionStatusType.PotentialActionStatus
+                        },
+                        tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported
+                    })
+                        .exec();
+                    transaction_1.transactionEventEmitter.emitTransactionStatusChanged({
+                        id: reexportingTransaction.id,
+                        typeOf: reexportingTransaction.typeOf,
+                        status: reexportingTransaction.status
+                    });
+                }
+            }
+        });
+    }
     /**
      * タスクエクスポートの遅延している取引について明示的にemitTransactionStatusChangedを実行する
      */

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

@@ -1,6 +1,3 @@
-/**
- * 汎用決済サービス
- */
 import * as factory from '../../factory';
 import type { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../../repo/action';

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

@@ -13,6 +13,7 @@ exports.publishPaymentUrl = exports.processVoidPayTransaction = exports.person2u
 /**
  * 汎用決済サービス
  */
+const createDebug = require("debug");
 const factory = require("../../factory");
 const PayTransactionService = require("../assetTransaction/pay");
 const code_1 = require("../code");
@@ -22,6 +23,7 @@ const onPaymentStatusChanged_1 = require("./any/onPaymentStatusChanged");
 Object.defineProperty(exports, "onPaymentStatusChanged", { enumerable: true, get: function () { return onPaymentStatusChanged_1.onPaymentStatusChanged; } });
 const person2username_1 = require("./any/person2username");
 Object.defineProperty(exports, "person2username", { enumerable: true, get: function () { return person2username_1.person2username; } });
+const debug = createDebug('chevre-domain:service:payment');
 /**
  * 決済承認中止
  * タスクから決済承認を取り消す
@@ -317,6 +319,23 @@ function authorize(params) {
             // const paymentMethodByTransaction = transaction.object.paymentMethods;
             const paymentMethodByTransaction = yield repos.transaction.findInProgressPaymentMethodId({ id: params.purpose.id });
             if (params.object.paymentMethodId === (paymentMethodByTransaction === null || paymentMethodByTransaction === void 0 ? void 0 : paymentMethodByTransaction.paymentMethodId)) {
+                // check existence of acceptAction when authorizing payment(2024-06-01~)
+                const acceptPayAction = (yield repos.action.search({
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: transaction.project.id } },
+                    typeOf: { $eq: factory.actionType.AcceptAction },
+                    actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+                    purpose: { id: { $in: [transaction.id] } },
+                    object: {
+                        transactionNumber: { $eq: params.object.paymentMethodId },
+                        typeOf: { $eq: factory.assetTransactionType.Pay }
+                    }
+                }, ['result'], [])).shift();
+                if (acceptPayAction === undefined) {
+                    throw new factory.errors.NotFound(factory.actionType.AcceptAction);
+                }
+                debug('acceptPayAction found:', acceptPayAction);
                 // 検証強化(2024-01-04~)
                 validatePaymentMethodByTransaction({
                     object: params.object,

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.33.0-alpha.10"
+  "version": "21.33.0-alpha.12"
 }