@chevre/domain 21.2.0-alpha.30 → 21.2.0-alpha.32

package/example/src/chevre/searchAbortedTasks.ts

@@ -9,18 +9,24 @@ async function main() {
 
     const taskRepo = new chevre.repository.Task(mongoose.connection);
 
-    const tasks = <chevre.factory.task.ITask<chevre.factory.taskName.Pay>[]>await taskRepo.search({
+    const tasks = <chevre.factory.task.ITask<chevre.factory.taskName.ConfirmPayTransaction>[]>await taskRepo.search({
         // limit: 100,
         // page: 1,
-        name: chevre.factory.taskName.Pay,
+        name: {
+            $in: [chevre.factory.taskName.ConfirmPayTransaction]
+            // $nin: [
+            //     chevre.factory.taskName.ImportEventsFromCOA,
+            //     chevre.factory.taskName.ImportEventCapacitiesFromCOA
+            // ]
+        },
         statuses: [chevre.factory.taskStatus.Aborted],
-        runsFrom: moment('2023-04-27T00:00:00Z')
+        runsFrom: moment('2023-05-02T22:00:00Z')
             .toDate(),
         sort: { runsAt: chevre.factory.sortType.Ascending }
     });
-    console.log(tasks.map((task) => `${task.project.id},${task.id},${moment(task.runsAt)
+    console.log(tasks.map((task) => `${task.project.id},${task.id},${task.name},${moment(task.runsAt)
         .tz('Asia/Tokyo')
-        .format('YYYY-MM-DDTHH:mm:ssZ')},"${task.data.object[0].paymentMethod.paymentMethodId}"`)
+        .format('YYYY-MM-DDTHH:mm:ssZ')},"${task.data.object[0]?.transactionNumber}"`)
         .join('\n'));
     console.log(tasks.length);
 }

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

@@ -9,7 +9,8 @@ async function main() {
     const transactionRepo = new chevre.repository.Transaction(mongoose.connection);
     const result = await transactionRepo.startExportTasks({
         typeOf: { $in: [chevre.factory.transactionType.PlaceOrder] },
-        status: chevre.factory.transactionStatusType.Confirmed
+        status: chevre.factory.transactionStatusType.Confirmed,
+        tasksExportAction: { agent: { name: 'xxx' } }
     });
     console.log(result);
 }

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

@@ -4,7 +4,6 @@ import { RedisClientType } from 'redis';
  */
 export declare class RedisRepository {
     private static readonly REDIS_KEY_PREFIX_NEW;
-    private static readonly REDIS_KEY_PREFIX;
     private readonly redisClient;
     constructor(redisClient: RedisClientType);
     private static alignDigits;

package/lib/chevre/repo/confirmationNumber.js

@@ -16,7 +16,6 @@ const util = require("util");
 // tslint:disable-next-line:no-require-imports no-var-requires
 const fpe = require('node-fpe');
 const factory = require("../factory");
-const settings_1 = require("../settings");
 const CONFIRMATION_NUMBER_MIN_LENGH = 4;
 /**
  * 確認番号リポジトリ
@@ -34,19 +33,9 @@ class RedisRepository {
         return aligndNumber;
     }
     static createKey(params) {
-        const useNewKey = params.orderDate instanceof Date
-            && moment(params.orderDate)
-                .isSameOrAfter(settings_1.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM);
-        if (useNewKey) {
-            return util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX_NEW, moment(params.orderDate)
-                .tz('Asia/Tokyo')
-                .format('YYMM'));
-        }
-        else {
-            return util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX, moment(params.orderDate)
-                .tz('Asia/Tokyo')
-                .format('YYMM'));
-        }
+        return util.format('%s:%s', RedisRepository.REDIS_KEY_PREFIX_NEW, moment(params.orderDate)
+            .tz('Asia/Tokyo')
+            .format('YYMM'));
     }
     /**
      * 発行する
@@ -81,5 +70,4 @@ class RedisRepository {
     }
 }
 RedisRepository.REDIS_KEY_PREFIX_NEW = 'confirmationNumber';
-RedisRepository.REDIS_KEY_PREFIX = 'cinerino:confirmationNumber';
 exports.RedisRepository = RedisRepository;

package/lib/chevre/service/offer/event/voidTransaction.d.ts

@@ -5,6 +5,7 @@ import { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLimit/o
 import { MongoRepository as ReservationRepo } from '../../../repo/reservation';
 import { StockHolderRepository as StockHolderRepo } from '../../../repo/stockHolder';
 import { MongoRepository as TaskRepo } from '../../../repo/task';
+import { MongoRepository as TransactionRepo } from '../../../repo/transaction';
 export import WebAPIIdentifier = factory.service.webAPI.Identifier;
 interface IVoidTransactionRepos {
     action: ActionRepo;
@@ -13,6 +14,7 @@ interface IVoidTransactionRepos {
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
+    transaction: TransactionRepo;
 }
 /**
  * イベントオファー承認取消(タスクから実行)

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

@@ -26,8 +26,13 @@ exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
  */
 function voidTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const transaction = yield repos.transaction.findById({
+            typeOf: params.purpose.typeOf,
+            id: params.purpose.id,
+            inclusion: ['_id', 'typeOf', 'status']
+        });
         // 座席仮予約アクション検索
-        const authorizeActions = yield repos.action.searchByPurpose({
+        let authorizeActions = yield repos.action.searchByPurpose({
             typeOf: factory.actionType.AuthorizeAction,
             purpose: {
                 typeOf: params.purpose.typeOf,
@@ -36,6 +41,17 @@ function voidTransaction(params) {
         })
             .then((actions) => actions
             .filter((a) => a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation));
+        switch (transaction.status) {
+            case factory.transactionStatusType.InProgress:
+                throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
+            // 確定取引に対応(2023-05-07~)
+            case factory.transactionStatusType.Confirmed:
+                // アクションステータスを検証する
+                authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
+                break;
+            default:
+            // no op
+        }
         yield Promise.all(authorizeActions.map((action) => __awaiter(this, void 0, void 0, function* () {
             yield repos.action.cancel({ typeOf: action.typeOf, id: action.id });
             switch (action.instrument.identifier) {

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

@@ -17,6 +17,7 @@ const offer_1 = require("../../repo/rateLimit/offer");
 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");
 /**
  * タスク実行関数
@@ -38,7 +39,8 @@ function call(data) {
             stockHolder: stockHolderRepo,
             offerRateLimit: offerRateLimitRepo,
             reservation: reservationRepo,
-            task: taskRepo
+            task: taskRepo,
+            transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });
 }

package/lib/chevre/settings.d.ts

@@ -31,7 +31,6 @@ export declare const DEFAULT_TASKS_EXPORT_AGENT_NAME: string;
 export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_NEW_EVENT_AVAILABILITY_KEY_FROM: moment.Moment;
-export declare const USE_NEW_CONFIRMATION_NUMBER_KEY_FROM: moment.Moment;
 export declare const USE_EVENT_EMITTERS: boolean;
 /**
  * グローバル設定

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.USE_EVENT_EMITTERS = exports.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = void 0;
+exports.settings = exports.USE_EVENT_EMITTERS = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = void 0;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -50,9 +50,6 @@ exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_PAY_ASSET_TR
 exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = (typeof process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM === 'string')
     ? moment(process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM)
     : moment('2023-08-31T15:00:00Z');
-exports.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM = (typeof process.env.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM === 'string')
-    ? moment(process.env.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM)
-    : moment('2023-04-30T15:00:00Z');
 exports.USE_EVENT_EMITTERS = process.env.USE_EVENT_EMITTERS === '1';
 /**
  * グローバル設定

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.30"
+  "version": "21.2.0-alpha.32"
 }