@chevre/domain 21.2.0-alpha.2 → 21.2.0-alpha.21

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -387,13 +387,14 @@ function filterByEligibleSeatingType(params) {
         const maximumAttendeeCapacity = eligibleSeatOffers.length;
         let remainingAttendeeCapacity;
         if (maximumAttendeeCapacity > 0) {
-            const availabilities = yield repos.eventAvailability.searchAvailability({
+            const availabilities = yield repos.stockHolder.searchHolders({
                 eventId: params.event.id,
                 startDate: moment(params.event.startDate)
                     .toDate(),
                 offers: eligibleSeatOffers
             });
-            remainingAttendeeCapacity = availabilities.filter((a) => a.availability === factory.itemAvailability.InStock).length;
+            // remainingAttendeeCapacity = availabilities.filter((a) => a.availability === factory.itemAvailability.InStock).length;
+            remainingAttendeeCapacity = availabilities.filter((holder) => typeof holder !== 'string').length;
         }
         else {
             remainingAttendeeCapacity = 0;
@@ -438,7 +439,7 @@ function aggregateReservationByEvent(params) {
         // remainingAttendeeCapacityを決定
         if (typeof maximumAttendeeCapacity === 'number') {
             // 残席数を座席ロック数から計算
-            const unavailableOfferCount = yield repos.eventAvailability.countUnavailableOffers({
+            const unavailableOfferCount = yield repos.stockHolder.countUnavailableOffers({
                 event: {
                     id: params.event.id,
                     startDate: moment(params.event.startDate)

package/lib/chevre/service/assetTransaction/cancelReservation.js

@@ -13,13 +13,11 @@ exports.exportTasksById = exports.startAndConfirm = exports.confirm = exports.st
 /**
  * 予約取消取引サービス
  */
-const createDebug = require("debug");
 const moment = require("moment");
 const mongoose = require("mongoose");
 const factory = require("../../factory");
 const settings_1 = require("../../settings");
 const factory_1 = require("./cancelReservation/factory");
-const debug = createDebug('chevre-domain:service');
 function validateStartParams(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
@@ -235,9 +233,7 @@ function exportTasksById(params) {
             default:
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
-        debug('taskAttributes prepared', taskAttributes);
-        return repos.task.saveMany(taskAttributes);
-        // return Promise.all(taskAttributes.map(async (a) => repos.task.save(a)));
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

package/lib/chevre/service/assetTransaction/moneyTransfer.js

@@ -430,7 +430,7 @@ function exportTasksById(params) {
             default:
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
-        return repos.task.saveMany(taskAttributes);
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

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

@@ -281,7 +281,7 @@ function processAuthorizeMovieTicket(params, transaction, paymentServiceId, useC
 }
 function saveAuthorizeResult(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        return repos.assetTransaction.findByIdAndUpdate(params);
+        return repos.assetTransaction.findByIdAndUpdateInProgress(params);
     });
 }
 /**
@@ -470,7 +470,7 @@ function exportTasksById(params) {
             default:
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
-        return repos.task.saveMany(taskAttributes);
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

package/lib/chevre/service/assetTransaction/refund.js

@@ -218,7 +218,7 @@ function exportTasksById(params) {
             default:
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
-        return repos.task.saveMany(taskAttributes);
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

package/lib/chevre/service/assetTransaction/registerService.js

@@ -301,8 +301,7 @@ function exportTasksById(params) {
             default:
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
-        return repos.task.saveMany(taskAttributes);
-        // return Promise.all(taskAttributes.map(async (a) => repos.task.save(a)));
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

package/lib/chevre/service/assetTransaction/reserve.d.ts

@@ -2,7 +2,6 @@ import * as factory from '../../factory';
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import { IMinimizedIndividualEvent, MongoRepository as EventRepo } from '../../repo/event';
-import { RedisRepository as ScreeningEventAvailabilityRepo } from '../../repo/itemAvailability/screeningEvent';
 import { MongoRepository as OfferRepo } from '../../repo/offer';
 import { MongoRepository as OfferCatalogRepo } from '../../repo/offerCatalog';
 import { MongoRepository as OrderRepo } from '../../repo/order';
@@ -12,9 +11,10 @@ import { MongoRepository as ProductRepo } from '../../repo/product';
 import { MongoRepository as ProjectRepo } from '../../repo/project';
 import { RedisRepository as OfferRateLimitRepo } from '../../repo/rateLimit/offer';
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
+import { StockHolderRepository as StockHolderRepo } from '../../repo/stockHolder';
 import { MongoRepository as TaskRepo } from '../../repo/task';
 export interface IStartOperationRepos {
-    eventAvailability: ScreeningEventAvailabilityRepo;
+    stockHolder: StockHolderRepo;
     event: EventRepo;
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;
@@ -29,7 +29,7 @@ export interface IStartOperationRepos {
 }
 export type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
 export interface IAddReservationsOperationRepos {
-    eventAvailability: ScreeningEventAvailabilityRepo;
+    stockHolder: StockHolderRepo;
     event: EventRepo;
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;
@@ -44,7 +44,7 @@ export interface IAddReservationsOperationRepos {
 export type IAddReservationsOperation<T> = (repos: IAddReservationsOperationRepos) => Promise<T>;
 export type ICancelOperation<T> = (repos: {
     action: ActionRepo;
-    eventAvailability: ScreeningEventAvailabilityRepo;
+    stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;
     task: TaskRepo;

package/lib/chevre/service/assetTransaction/reserve.js

@@ -209,7 +209,7 @@ function searchEventSeatOffers(params) {
                 $projection: params.$projection
             });
             if (seats.length > 0) {
-                const availabilities = yield repos.eventAvailability.searchAvailability({
+                const availabilities = yield repos.stockHolder.searchHolders({
                     eventId: params.event.id,
                     startDate: moment(params.event.startDate)
                         .toDate(),
@@ -225,7 +225,10 @@ function searchEventSeatOffers(params) {
                     return OfferService.addOffers2Seat({
                         seat,
                         // unavailableOffers: [],
-                        availability: availabilities[index].availability,
+                        // availability: availabilities[index].availability,
+                        availability: (typeof availabilities[index] === 'string')
+                            ? factory.itemAvailability.OutOfStock // ホルダーが存在すればOutOfStock
+                            : factory.itemAvailability.InStock,
                         priceSpecs
                     });
                 });
@@ -638,7 +641,7 @@ function processLockSeats(params) {
         const holder = params.transaction.id;
         const maximumAttendeeCapacity4event = (_a = params.event.location) === null || _a === void 0 ? void 0 : _a.maximumAttendeeCapacity;
         if (typeof maximumAttendeeCapacity4event === 'number') {
-            yield repos.eventAvailability.lockIfNotLimitExceeded({
+            yield repos.stockHolder.lockIfNotLimitExceeded({
                 eventId: params.event.id,
                 startDate: moment(params.event.startDate)
                     .toDate(),
@@ -648,7 +651,7 @@ function processLockSeats(params) {
             }, maximumAttendeeCapacity4event);
         }
         else {
-            yield repos.eventAvailability.lock({
+            yield repos.stockHolder.lock({
                 eventId: params.event.id,
                 startDate: moment(params.event.startDate)
                     .toDate(),
@@ -857,7 +860,7 @@ function exportTasksById(params) {
             default:
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
-        return repos.task.saveMany(taskAttributes);
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

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

@@ -3,7 +3,6 @@
  */
 import * as factory from '../factory';
 import { MongoRepository as AssetTransactionRepo } from '../repo/assetTransaction';
-import { MongoRepository as ProjectRepo } from '../repo/project';
 import { MongoRepository as TaskRepo } from '../repo/task';
 import * as CancelReservationTransactionService from './assetTransaction/cancelReservation';
 import * as MoneyTransferTransactionService from './assetTransaction/moneyTransfer';
@@ -30,7 +29,6 @@ export declare function exportTasks<T extends factory.assetTransactionType>(para
         $in: T[];
     };
 }): (repos: {
-    project: ProjectRepo;
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
 }) => Promise<{

package/lib/chevre/service/assetTransaction.js

@@ -32,7 +32,6 @@ exports.reserve = ReserveTransactionService;
 function exportTasks(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const transaction = yield repos.assetTransaction.startExportTasks({
-            // project: params.project,
             typeOf: params.typeOf,
             status: params.status
         });

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

@@ -2,7 +2,6 @@ import * as factory from '../../../factory';
 import { MongoRepository as ActionRepo } from '../../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../../repo/assetTransaction';
 import { MongoRepository as EventRepo } from '../../../repo/event';
-import { RedisRepository as ScreeningEventAvailabilityRepo } from '../../../repo/itemAvailability/screeningEvent';
 import { MongoRepository as OfferRepo } from '../../../repo/offer';
 import { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
 import { MongoRepository as PlaceRepo } from '../../../repo/place';
@@ -11,6 +10,7 @@ import { MongoRepository as ProductRepo } from '../../../repo/product';
 import { MongoRepository as ProjectRepo } from '../../../repo/project';
 import { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 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';
 import { RedisRepository as TransactionNumberRepo } from '../../../repo/transactionNumber';
@@ -19,7 +19,7 @@ interface IAuthorizeRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     event: EventRepo;
-    eventAvailability: ScreeningEventAvailabilityRepo;
+    stockHolder: StockHolderRepo;
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;
     offerRateLimit: OfferRateLimitRepo;

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

@@ -1,15 +1,15 @@
 import * as factory from '../../../factory';
 import { MongoRepository as ActionRepo } from '../../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../../repo/assetTransaction';
-import { RedisRepository as ScreeningEventAvailabilityRepo } from '../../../repo/itemAvailability/screeningEvent';
 import { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 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';
 interface ICancelRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
-    eventAvailability: ScreeningEventAvailabilityRepo;
+    stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;
     task: TaskRepo;

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

@@ -1,15 +1,15 @@
 import * as factory from '../../../factory';
 import { MongoRepository as ActionRepo } from '../../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../../repo/assetTransaction';
-import { RedisRepository as ScreeningEventAvailabilityRepo } from '../../../repo/itemAvailability/screeningEvent';
 import { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import { MongoRepository as ReservationRepo } from '../../../repo/reservation';
+import { StockHolderRepository as StockHolderRepo } from '../../../repo/stockHolder';
 import { MongoRepository as TaskRepo } from '../../../repo/task';
 export import WebAPIIdentifier = factory.service.webAPI.Identifier;
 interface IVoidTransactionRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
-    eventAvailability: ScreeningEventAvailabilityRepo;
+    stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;
     task: TaskRepo;

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

@@ -1,8 +1,8 @@
 import { MongoRepository as EventRepo } from '../repo/event';
-import { RedisRepository as EventAvailabilityRepo } from '../repo/itemAvailability/screeningEvent';
 import { MongoRepository as PlaceRepo } from '../repo/place';
 import { MongoRepository as PriceSpecificationRepo } from '../repo/priceSpecification';
 import { MongoRepository as ProjectRepo } from '../repo/project';
+import { StockHolderRepository as StockHolderRepo } from '../repo/stockHolder';
 import { MongoRepository as TaskRepo } from '../repo/task';
 import * as factory from '../factory';
 import * as EventOfferService from './offer/event';
@@ -44,7 +44,7 @@ export declare function searchEventSeatOffersWithPaging(params: {
 }): (repos: {
     event: EventRepo;
     priceSpecification: PriceSpecificationRepo;
-    eventAvailability: EventAvailabilityRepo;
+    stockHolder: StockHolderRepo;
     place: PlaceRepo;
 }) => Promise<factory.place.seat.IPlaceWithOffer[]>;
 interface IChangedEvent {

package/lib/chevre/service/offer.js

@@ -88,7 +88,7 @@ function searchEventSeatOffersWithPaging(params) {
                     }
                 } }));
             if (seats.length > 0) {
-                const availabilities = yield repos.eventAvailability.searchAvailability({
+                const availabilities = yield repos.stockHolder.searchHolders({
                     eventId: params.event.id,
                     startDate: moment(event.startDate)
                         .toDate(),
@@ -104,7 +104,10 @@ function searchEventSeatOffersWithPaging(params) {
                     return addOffers2Seat({
                         seat,
                         // unavailableOffers: [],
-                        availability: availabilities[index].availability,
+                        // availability: availabilities[index].availability,
+                        availability: (typeof availabilities[index] === 'string')
+                            ? factory.itemAvailability.OutOfStock // ホルダーが存在すればOutOfStock
+                            : factory.itemAvailability.InStock,
                         priceSpecs
                     });
                 });

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

@@ -89,7 +89,7 @@ function onOrderStatusChanged(params) {
                 break;
             default:
         }
-        yield repos.task.saveMany(tasks);
+        yield repos.task.saveMany(tasks, { emitImmediately: true });
     });
 }
 exports.onOrderStatusChanged = onOrderStatusChanged;

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

@@ -269,6 +269,6 @@ function onPlaceOrder(params) {
             }
         }
         // タスク保管
-        yield repos.task.saveMany(taskAttributes);
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }

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

@@ -204,10 +204,6 @@ function onReturn(returnActionAttributes) {
             }
         }
         // タスク保管
-        // saveManyに変更(2023-02-01~)
-        yield repos.task.saveMany(taskAttributes);
-        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
-        //     return repos.task.save(taskAttribute);
-        // }));
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }

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

@@ -178,6 +178,6 @@ function onSend(params) {
             }
         }
         // タスク保管
-        yield repos.task.saveMany(taskAttributes);
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }

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

@@ -194,7 +194,7 @@ function publishPaymentUrl(params) {
             paymentUrl: result.paymentUrl,
             issuedThrough: { id: (typeof startParams.object.id === 'string') ? startParams.object.id : '' }
         };
-        yield repos.transaction.findByIdAndUpdate({
+        yield repos.transaction.findByIdAndUpdateInProgress({
             id: transaction.id,
             update: { $set: { 'object.paymentMethods': paymentMethodByPaymentUrl } }
         });

package/lib/chevre/service/reserve/cancelReservation.d.ts

@@ -1,9 +1,9 @@
 import * as factory from '../../factory';
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
-import { RedisRepository as ScreeningEventAvailabilityRepo } from '../../repo/itemAvailability/screeningEvent';
 import { RedisRepository as OfferRateLimitRepo } from '../../repo/rateLimit/offer';
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
+import { StockHolderRepository as StockHolderRepo } from '../../repo/stockHolder';
 import { MongoRepository as TaskRepo } from '../../repo/task';
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 /**
@@ -12,7 +12,7 @@ type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservat
 declare function cancelPendingReservation(actionAttributesList: factory.action.cancel.reservation.IAttributes[]): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
-    eventAvailability: ScreeningEventAvailabilityRepo;
+    stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
@@ -22,7 +22,7 @@ declare function cancelPendingReservation(actionAttributesList: factory.action.c
  */
 declare function cancelReservation(actionAttributesList: factory.action.cancel.reservation.IAttributes[]): (repos: {
     action: ActionRepo;
-    eventAvailability: ScreeningEventAvailabilityRepo;
+    stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;
     task: TaskRepo;

package/lib/chevre/service/reserve/cancelReservation.js

@@ -344,9 +344,9 @@ function processUnlockSeat(params) {
                 seatSection: ''
             }
         };
-        let holder = yield repos.eventAvailability.getHolder(lockKey);
+        let holder = yield repos.stockHolder.getHolder(lockKey);
         if (holder === params.expectedHolder) {
-            yield repos.eventAvailability.unlock(lockKey);
+            yield repos.stockHolder.unlock(lockKey);
         }
         // 予約取引がまだ座席を保持していれば座席ロック解除
         const ticketedSeat = reservation.reservedTicket.ticketedSeat;
@@ -359,9 +359,9 @@ function processUnlockSeat(params) {
                     seatSection: ticketedSeat.seatSection
                 }
             };
-            holder = yield repos.eventAvailability.getHolder(lockKey);
+            holder = yield repos.stockHolder.getHolder(lockKey);
             if (holder === params.expectedHolder) {
-                yield repos.eventAvailability.unlock(lockKey);
+                yield repos.stockHolder.unlock(lockKey);
             }
         }
         // subReservationがあれば、そちらも解除(順不同)
@@ -380,9 +380,9 @@ function processUnlockSeat(params) {
                             seatSection: seatSection4sub
                         }
                     };
-                    const holder4sub = yield repos.eventAvailability.getHolder(lockKey4sub);
+                    const holder4sub = yield repos.stockHolder.getHolder(lockKey4sub);
                     if (holder4sub === params.expectedHolder) {
-                        yield repos.eventAvailability.unlock(lockKey4sub);
+                        yield repos.stockHolder.unlock(lockKey4sub);
                     }
                 }
             })));

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

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const factory = require("../../factory");
 const event_1 = require("../../repo/event");
-const screeningEvent_1 = require("../../repo/itemAvailability/screeningEvent");
 const offer_1 = require("../../repo/offer");
 const offerCatalog_1 = require("../../repo/offerCatalog");
 const place_1 = require("../../repo/place");
@@ -20,6 +19,7 @@ const product_1 = require("../../repo/product");
 const project_1 = require("../../repo/project");
 const offer_2 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
+const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
 const AggregationService = require("../aggregation");
 /**
@@ -32,7 +32,7 @@ function call(data) {
         }
         yield AggregationService.event.aggregateScreeningEvent(data)({
             event: new event_1.MongoRepository(settings.connection),
-            eventAvailability: new screeningEvent_1.RedisRepository(settings.redisClient),
+            stockHolder: new stockHolder_1.StockHolderRepository(settings.redisClient),
             offer: new offer_1.MongoRepository(settings.connection),
             offerCatalog: new offerCatalog_1.MongoRepository(settings.connection),
             offerRateLimit: new offer_2.RedisRepository(settings.redisClient),

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

@@ -13,9 +13,9 @@ exports.call = void 0;
 const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
-const screeningEvent_1 = require("../../repo/itemAvailability/screeningEvent");
 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 ReserveService = require("../reserve");
 /**
@@ -30,12 +30,12 @@ function call(data) {
         const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
         const taskRepo = new task_1.MongoRepository(settings.connection);
         const reservationRepo = new reservation_1.MongoRepository(settings.connection);
-        const eventAvailabilityRepo = new screeningEvent_1.RedisRepository(settings.redisClient);
+        const stockHolderRepo = new stockHolder_1.StockHolderRepository(settings.redisClient);
         const offerRateLimitRepo = new offer_1.RedisRepository(settings.redisClient);
         yield ReserveService.cancelPendingReservation(data.actionAttributes)({
             action: actionRepo,
             assetTransaction: assetTransactionRepo,
-            eventAvailability: eventAvailabilityRepo,
+            stockHolder: stockHolderRepo,
             offerRateLimit: offerRateLimitRepo,
             reservation: reservationRepo,
             task: taskRepo

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

@@ -13,9 +13,9 @@ exports.call = void 0;
 const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
-const screeningEvent_1 = require("../../repo/itemAvailability/screeningEvent");
 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 ReserveService = require("../reserve");
 /**
@@ -30,7 +30,7 @@ function call(data) {
         const reservationRepo = new reservation_1.MongoRepository(settings.connection);
         const taskRepo = new task_1.MongoRepository(settings.connection);
         const transactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
-        const eventAvailabilityRepo = new screeningEvent_1.RedisRepository(settings.redisClient);
+        const stockHolderRepo = new stockHolder_1.StockHolderRepository(settings.redisClient);
         const offerRateLimitRepo = new offer_1.RedisRepository(settings.redisClient);
         yield ReserveService.cancelReservation(data.actionAttributes)({
             action: actionRepo,
@@ -38,7 +38,7 @@ function call(data) {
             task: taskRepo,
             assetTransaction: transactionRepo,
             offerRateLimit: offerRateLimitRepo,
-            eventAvailability: eventAvailabilityRepo
+            stockHolder: stockHolderRepo
         });
     });
 }

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

@@ -13,9 +13,9 @@ exports.call = void 0;
 const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
-const screeningEvent_1 = require("../../repo/itemAvailability/screeningEvent");
 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 EventOfferService = require("../offer/event");
 /**
@@ -28,14 +28,14 @@ function call(data) {
         }
         const actionRepo = new action_1.MongoRepository(settings.connection);
         const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
-        const eventAvailabilityRepo = new screeningEvent_1.RedisRepository(settings.redisClient);
+        const stockHolderRepo = new stockHolder_1.StockHolderRepository(settings.redisClient);
         const offerRateLimitRepo = new offer_1.RedisRepository(settings.redisClient);
         const reservationRepo = new reservation_1.MongoRepository(settings.connection);
         const taskRepo = new task_1.MongoRepository(settings.connection);
         yield EventOfferService.voidTransaction(data)({
             action: actionRepo,
             assetTransaction: assetTransactionRepo,
-            eventAvailability: eventAvailabilityRepo,
+            stockHolder: stockHolderRepo,
             offerRateLimit: offerRateLimitRepo,
             reservation: reservationRepo,
             task: taskRepo

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

@@ -16,11 +16,20 @@ export type TaskOperation<T> = (repos: {
     task: TaskRepo;
 }) => Promise<T>;
 export type IOperation<T> = (settings: IConnectionSettings) => Promise<T>;
+export declare function executeById(params: {
+    id: string;
+    executor: {
+        name: string;
+    };
+}): IOperation<void>;
 /**
  * タスク名でタスクをひとつ実行する
  */
 export declare function executeByName<T extends factory.taskName>(params: {
     name: T;
+    executor: {
+        name: string;
+    };
 }): IOperation<void>;
 /**
  * タスクを実行する

package/lib/chevre/service/task.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.notifyAbortedTasks = exports.abort = exports.retry = exports.execute = exports.executeByName = void 0;
+exports.notifyAbortedTasks = exports.abort = exports.retry = exports.execute = exports.executeByName = exports.executeById = void 0;
 /**
  * タスクサービス
  */
@@ -20,6 +20,27 @@ const NotificationService = require("./notification");
 const factory_1 = require("./notification/factory");
 const settings_1 = require("../settings");
 const debug = createDebug('chevre-domain:service:task');
+function executeById(params) {
+    return (settings) => __awaiter(this, void 0, void 0, function* () {
+        const taskRepo = new task_1.MongoRepository(settings.connection);
+        // 未実行のタスクを取得
+        // tslint:disable-next-line:no-null-keyword
+        let task = null;
+        try {
+            task = yield taskRepo.executeById({ id: params.id, executor: params.executor });
+        }
+        catch (error) {
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore next */
+            debug('service.task.executeById error:', error);
+        }
+        // タスクがなければ終了
+        if (task !== null) {
+            yield execute(task)(settings);
+        }
+    });
+}
+exports.executeById = executeById;
 /**
  * タスク名でタスクをひとつ実行する
  */

package/lib/chevre/service/transaction/moneyTransfer.js

@@ -576,9 +576,7 @@ function exportTasksById(params) {
             transaction,
             runsAt: taskRunsAt
         });
-        // saveManyに変更(2023-02-01~)
-        yield repos.task.saveMany(taskAttributes);
-        // await Promise.all(taskAttributes.map(async (a) => repos.task.save(a)));
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

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

@@ -36,11 +36,7 @@ function exportTasksById(params) {
             transaction,
             runsAt: taskRunsAt
         });
-        // saveManyに変更(2023-02-01~)
-        yield repos.task.saveMany(taskAttributes);
-        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
-        //     await repos.task.save(taskAttribute);
-        // }));
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;