@chevre/domain 21.2.0-alpha.13 → 21.2.0-alpha.131

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

@@ -0,0 +1,15 @@
+import * as factory from '../../factory';
+import { MongoRepository as OrderRepo } from '../../repo/order';
+/**
+ * 予約使用のためのチケットトークンを検証する
+ */
+export declare function verifyToken4reservation(params: {
+    project: {
+        id: string;
+    };
+    agent: factory.action.check.token.IAgent;
+    reservationId: string;
+    token: string;
+}): (repos: {
+    order: OrderRepo;
+}) => Promise<void>;

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

@@ -0,0 +1,56 @@
+"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.verifyToken4reservation = void 0;
+const factory = require("../../factory");
+const code_1 = require("../code");
+/**
+ * 予約使用のためのチケットトークンを検証する
+ */
+function verifyToken4reservation(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const payload = yield (0, code_1.verifyToken)({
+            project: params.project,
+            agent: params.agent,
+            token: params.token
+        })({});
+        switch (payload.typeOf) {
+            case factory.order.OrderType.Order:
+                // reservationIdを含む注文の存在を確認するだけでよい(2023-01-31~)
+                const order = yield repos.order.findByOrderNumberAndReservationId({
+                    orderNumber: payload.orderNumber,
+                    reservationId: params.reservationId
+                });
+                // ステータス検証
+                switch (order.orderStatus) {
+                    case factory.orderStatus.OrderDelivered:
+                        break;
+                    default:
+                        throw new factory.errors.Argument('token', `invalid orderStatus '${order.orderStatus}'`);
+                }
+                // const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+                // const reservationExistsInOrder = acceptedOffers.some((offer) => {
+                //     return (
+                //         offer.itemOffered.typeOf === factory.reservationType.EventReservation
+                //         || offer.itemOffered.typeOf === factory.reservationType.BusReservation
+                //     )
+                //         && offer.itemOffered.id === params.reservationId;
+                // });
+                // if (!reservationExistsInOrder) {
+                //     throw new factory.errors.NotFound('AcceptedOffer');
+                // }
+                break;
+            default:
+                throw new factory.errors.NotImplemented(`Payload type ${payload.typeOf} not implemented`);
+        }
+    });
+}
+exports.verifyToken4reservation = verifyToken4reservation;

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

@@ -3,7 +3,8 @@
  */
 import { maskUnderName } from './reserve/factory';
 import { cancelPendingReservation, cancelReservation } from './reserve/cancelReservation';
-import { checkInRerservation } from './reserve/checkInReservation';
+import { checkInReservation } from './reserve/checkInReservation';
 import { confirmReservation } from './reserve/confirmReservation';
 import { useReservation } from './reserve/useReservation';
-export { maskUnderName, cancelPendingReservation, cancelReservation, checkInRerservation, confirmReservation, useReservation };
+import { verifyToken4reservation } from './reserve/verifyToken4reservation';
+export { maskUnderName, cancelPendingReservation, cancelReservation, checkInReservation, confirmReservation, useReservation, verifyToken4reservation };

package/lib/chevre/service/reserve.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useReservation = exports.confirmReservation = exports.checkInRerservation = exports.cancelReservation = exports.cancelPendingReservation = exports.maskUnderName = void 0;
+exports.verifyToken4reservation = exports.useReservation = exports.confirmReservation = exports.checkInReservation = exports.cancelReservation = exports.cancelPendingReservation = exports.maskUnderName = void 0;
 /**
  * 予約サービス
  */
@@ -10,8 +10,10 @@ const cancelReservation_1 = require("./reserve/cancelReservation");
 Object.defineProperty(exports, "cancelPendingReservation", { enumerable: true, get: function () { return cancelReservation_1.cancelPendingReservation; } });
 Object.defineProperty(exports, "cancelReservation", { enumerable: true, get: function () { return cancelReservation_1.cancelReservation; } });
 const checkInReservation_1 = require("./reserve/checkInReservation");
-Object.defineProperty(exports, "checkInRerservation", { enumerable: true, get: function () { return checkInReservation_1.checkInRerservation; } });
+Object.defineProperty(exports, "checkInReservation", { enumerable: true, get: function () { return checkInReservation_1.checkInReservation; } });
 const confirmReservation_1 = require("./reserve/confirmReservation");
 Object.defineProperty(exports, "confirmReservation", { enumerable: true, get: function () { return confirmReservation_1.confirmReservation; } });
 const useReservation_1 = require("./reserve/useReservation");
 Object.defineProperty(exports, "useReservation", { enumerable: true, get: function () { return useReservation_1.useReservation; } });
+const verifyToken4reservation_1 = require("./reserve/verifyToken4reservation");
+Object.defineProperty(exports, "verifyToken4reservation", { enumerable: true, get: function () { return verifyToken4reservation_1.verifyToken4reservation; } });

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

@@ -32,7 +32,7 @@ function call(data) {
         }
         yield AggregationService.event.aggregateScreeningEvent(data)({
             event: new event_1.MongoRepository(settings.connection),
-            stockHolder: new stockHolder_1.StockHolderRepository(settings.redisClient),
+            stockHolder: new stockHolder_1.StockHolderRepository(settings.redisClient, settings.connection),
             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

@@ -30,9 +30,13 @@ 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 stockHolderRepo = new stockHolder_1.StockHolderRepository(settings.redisClient);
+        const stockHolderRepo = new stockHolder_1.StockHolderRepository(settings.redisClient, settings.connection);
         const offerRateLimitRepo = new offer_1.RedisRepository(settings.redisClient);
-        yield ReserveService.cancelPendingReservation(data.actionAttributes)({
+        // アクション数は予約番号単位で1しかありえないはず(2023-06-05~)
+        if (data.actionAttributes.length !== 1) {
+            throw new factory.errors.Argument('data.actionAttributes', 'data.actionAttributes.length must be 1');
+        }
+        yield ReserveService.cancelPendingReservation(data.actionAttributes[0])({
             action: actionRepo,
             assetTransaction: assetTransactionRepo,
             stockHolder: stockHolderRepo,

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

@@ -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 stockHolderRepo = new stockHolder_1.StockHolderRepository(settings.redisClient);
+        const stockHolderRepo = new stockHolder_1.StockHolderRepository(settings.redisClient, settings.connection);
         const offerRateLimitRepo = new offer_1.RedisRepository(settings.redisClient);
         yield ReserveService.cancelReservation(data.actionAttributes)({
             action: actionRepo,

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

@@ -95,7 +95,7 @@ function onRegistered(actionAttributes) {
             taskAttributes.push(...orderProgramMembershipTasks);
         }
         // タスク保管
-        yield repos.task.saveMany(taskAttributes);
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.onRegistered = onRegistered;

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

@@ -10,8 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const order_1 = require("../../repo/order");
+const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const reservation_1 = require("../../repo/reservation");
 const transaction_1 = require("../../repo/transaction");
 const TransactionService = require("../transaction");
@@ -20,15 +23,14 @@ const TransactionService = require("../transaction");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
-        const reservationRepo = new reservation_1.MongoRepository(settings.connection);
-        const transactionRepo = new transaction_1.MongoRepository(settings.connection);
         yield TransactionService.deleteTransaction(data)({
-            action: actionRepo,
-            assetTransaction: assetTransactionRepo,
-            reservation: reservationRepo,
-            transaction: transactionRepo
+            accountingReport: new accountingReport_1.MongoRepository(settings.connection),
+            action: new action_1.MongoRepository(settings.connection),
+            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+            order: new order_1.MongoRepository(settings.connection),
+            ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),
+            reservation: new reservation_1.MongoRepository(settings.connection),
+            transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });
 }

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

@@ -35,6 +35,10 @@ function call(data) {
             offer: offerRepo,
             masterService
         });
+        yield OfferService.event.importCategoryCodesFromCOA(data)({
+            categoryCode: categoryCodeRepo,
+            masterService
+        });
     });
 }
 exports.call = call;

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

@@ -0,0 +1,7 @@
+import * as factory from '../../factory';
+import { IConnectionSettings } from '../task';
+export type IOperation<T> = (settings: IConnectionSettings) => Promise<T>;
+/**
+ * タスク実行関数
+ */
+export declare function call(data: factory.task.onAuthorizationCreated.IData): IOperation<void>;

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

@@ -0,0 +1,108 @@
+"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 action_1 = require("../../repo/action");
+const assetTransaction_1 = require("../../repo/assetTransaction");
+const code_1 = require("../../repo/code");
+const order_1 = require("../../repo/order");
+const ownershipInfo_1 = require("../../repo/ownershipInfo");
+const reservation_1 = require("../../repo/reservation");
+const task_1 = require("../../repo/task");
+const reserve_1 = require("../reserve");
+/**
+ * タスク実行関数
+ */
+function call(data) {
+    return (settings) => __awaiter(this, void 0, void 0, function* () {
+        yield onAuthorizationCreated(data)({
+            action: new action_1.MongoRepository(settings.connection),
+            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+            code: new code_1.MongoRepository(settings.connection),
+            order: new order_1.MongoRepository(settings.connection),
+            ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),
+            reservation: new reservation_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection)
+        });
+    });
+}
+exports.call = call;
+function onAuthorizationCreated(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // 発券対象予約ID
+        let reservationIds = [];
+        // 発券対象予約番号
+        let reservationNumbers = [];
+        // 発券対象イベントID
+        let reservationForIds = [];
+        const authorizationObject = yield repos.code.findOne({
+            code: params.code,
+            project: { id: params.project.id, typeOf: factory.organizationType.Project }
+        });
+        switch (authorizationObject.typeOf) {
+            case factory.order.OrderType.Order:
+                // 注文検索
+                const orderNumber = authorizationObject.orderNumber;
+                if (typeof orderNumber === 'string' && orderNumber.length > 0) {
+                    // 最適化(2023-01-28~)
+                    const order = yield repos.order.findByOrderNumber({
+                        orderNumber,
+                        inclusion: ['acceptedOffers'],
+                        exclusion: []
+                    });
+                    const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+                    reservationNumbers = acceptedOffers
+                        .filter((o) => o.itemOffered.typeOf === factory.reservationType.EventReservation
+                        || o.itemOffered.typeOf === factory.reservationType.BusReservation)
+                        .map((o) => o.itemOffered.reservationNumber);
+                    reservationNumbers = [...new Set(reservationNumbers)];
+                    reservationForIds = acceptedOffers
+                        .filter((o) => o.itemOffered.typeOf === factory.reservationType.EventReservation
+                        || o.itemOffered.typeOf === factory.reservationType.BusReservation)
+                        .map((o) => String(o.itemOffered.reservationFor.id));
+                    reservationForIds = [...new Set(reservationForIds)];
+                }
+                break;
+            case 'OwnershipInfo':
+                // 所有権検索
+                const ownershipInfoId = authorizationObject.id;
+                if (typeof ownershipInfoId === 'string' && ownershipInfoId.length > 0) {
+                    const ownershipInfo = yield repos.ownershipInfo.findById({ id: ownershipInfoId });
+                    // 座席予約に対する所有権であれば発券
+                    if (ownershipInfo.typeOfGood.typeOf === factory.reservationType.EventReservation
+                        || ownershipInfo.typeOfGood.typeOf === factory.reservationType.BusReservation) {
+                        const reservationId = String(ownershipInfo.typeOfGood.id);
+                        reservationIds = [reservationId];
+                        const reservation = yield repos.reservation.findById({ id: reservationId });
+                        reservationForIds = [String(reservation.reservationFor.id)];
+                    }
+                }
+                break;
+            default:
+            // no op
+        }
+        yield (0, reserve_1.checkInReservation)({
+            project: { id: params.project.id },
+            object: {
+                ids: reservationIds,
+                reservationNumbers: reservationNumbers,
+                reservationFor: { ids: reservationForIds }
+            },
+            reserveIfNotYet: params.reserveIfNotYet
+        })({
+            action: repos.action,
+            assetTransaction: repos.assetTransaction,
+            reservation: repos.reservation,
+            task: repos.task
+        });
+    });
+}

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

@@ -0,0 +1,7 @@
+import * as factory from '../../factory';
+import { IConnectionSettings } from '../task';
+export type IOperation<T> = (settings: IConnectionSettings) => Promise<T>;
+/**
+ * タスク実行関数
+ */
+export declare function call(data: factory.task.onEventChanged.IData): IOperation<void>;

package/lib/chevre/service/task/{deleteOrder.js → onEventChanged.js}

@@ -10,25 +10,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
-const accountingReport_1 = require("../../repo/accountingReport");
-const order_1 = require("../../repo/order");
-const ownershipInfo_1 = require("../../repo/ownershipInfo");
-const reservation_1 = require("../../repo/reservation");
-const OrderService = require("../order");
+const event_1 = require("../../repo/event");
+const project_1 = require("../../repo/project");
+const task_1 = require("../../repo/task");
+const offer_1 = require("../offer");
 /**
  * タスク実行関数
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        const accountingReportRepo = new accountingReport_1.MongoRepository(settings.connection);
-        const orderRepo = new order_1.MongoRepository(settings.connection);
-        const ownershipInfoRepo = new ownershipInfo_1.MongoRepository(settings.connection);
-        const reservationRepo = new reservation_1.MongoRepository(settings.connection);
-        yield OrderService.deleteOrder(data)({
-            accountingReport: accountingReportRepo,
-            order: orderRepo,
-            ownershipInfo: ownershipInfoRepo,
-            reservation: reservationRepo
+        yield (0, offer_1.onEventChanged)(data)({
+            event: new event_1.MongoRepository(settings.connection),
+            project: new project_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection)
         });
     });
 }

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

@@ -0,0 +1,7 @@
+import * as factory from '../../factory';
+import { IConnectionSettings } from '../task';
+export type IOperation<T> = (settings: IConnectionSettings) => Promise<T>;
+/**
+ * タスク実行関数
+ */
+export declare function call(data: factory.task.onResourceUpdated.IData): IOperation<void>;