@chevre/domain 21.2.0-alpha.71 → 21.2.0-alpha.73

package/example/src/chevre/processReserve.ts

@@ -68,7 +68,8 @@ async function main() {
         },
         validateEvent: false,
         validateEventOfferPeriod: false,
-        validateAppliesToMovieTicket: true
+        validateAppliesToMovieTicket: true,
+        disablePendingReservations: true
     })({
         stockHolder: itemAvailabilityRepo,
         event: eventRepo,

package/lib/chevre/repo/mongoose/schemas/order.d.ts

@@ -64,9 +64,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     project?: any;
     orderNumber?: string | undefined;
     seller?: any;
+    broker?: any;
     price?: number | undefined;
     priceCurrency?: string | undefined;
-    broker?: any;
     customer?: any;
     returner?: any;
     confirmationNumber?: string | undefined;
@@ -87,9 +87,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     project?: any;
     orderNumber?: string | undefined;
     seller?: any;
+    broker?: any;
     price?: number | undefined;
     priceCurrency?: string | undefined;
-    broker?: any;
     customer?: any;
     returner?: any;
     confirmationNumber?: string | undefined;
@@ -110,9 +110,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     project?: any;
     orderNumber?: string | undefined;
     seller?: any;
+    broker?: any;
     price?: number | undefined;
     priceCurrency?: string | undefined;
-    broker?: any;
     customer?: any;
     returner?: any;
     confirmationNumber?: string | undefined;

package/lib/chevre/repo/mongoose/schemas/reservation.d.ts

@@ -62,16 +62,16 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     additionalProperty?: any;
     reservationFor?: any;
     subReservation?: any;
+    broker?: any;
     price?: any;
     priceCurrency?: string | undefined;
+    issuedThrough?: any;
+    reservedTicket?: any;
     additionalTicketText?: string | undefined;
     bookingTime?: Date | undefined;
-    broker?: any;
-    issuedThrough?: any;
     modifiedTime?: Date | undefined;
     numSeats?: number | undefined;
     programMembershipUsed?: any;
-    reservedTicket?: any;
     underName?: any;
     bookingAgent?: any;
     cancelReservationUrl?: string | undefined;
@@ -90,16 +90,16 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     additionalProperty?: any;
     reservationFor?: any;
     subReservation?: any;
+    broker?: any;
     price?: any;
     priceCurrency?: string | undefined;
+    issuedThrough?: any;
+    reservedTicket?: any;
     additionalTicketText?: string | undefined;
     bookingTime?: Date | undefined;
-    broker?: any;
-    issuedThrough?: any;
     modifiedTime?: Date | undefined;
     numSeats?: number | undefined;
     programMembershipUsed?: any;
-    reservedTicket?: any;
     underName?: any;
     bookingAgent?: any;
     cancelReservationUrl?: string | undefined;
@@ -118,16 +118,16 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     additionalProperty?: any;
     reservationFor?: any;
     subReservation?: any;
+    broker?: any;
     price?: any;
     priceCurrency?: string | undefined;
+    issuedThrough?: any;
+    reservedTicket?: any;
     additionalTicketText?: string | undefined;
     bookingTime?: Date | undefined;
-    broker?: any;
-    issuedThrough?: any;
     modifiedTime?: Date | undefined;
     numSeats?: number | undefined;
     programMembershipUsed?: any;
-    reservedTicket?: any;
     underName?: any;
     bookingAgent?: any;
     cancelReservationUrl?: string | undefined;

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

@@ -31,14 +31,16 @@ export declare class MongoRepository {
         inclusion?: string[];
         exclusion?: string[];
     }): Promise<factory.reservation.IReservation<T>>;
-    /**
-     * 予約確定
-     */
     confirmByReservationNumber(params: {
         reservationNumber: string;
         previousReservationStatus: factory.reservationStatusType;
         underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
     }): Promise<void>;
+    confirmByIdIfNotExist(params: {
+        reservation: factory.assetTransaction.reserve.IObjectSubReservation;
+        reservationFor: factory.assetTransaction.reserve.IReservationFor;
+        underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+    }): Promise<void>;
     /**
      * 予約取消
      */

package/lib/chevre/repo/reservation.js

@@ -910,48 +910,6 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    /**
-     * 予約確定
-     */
-    // public async confirm<T extends factory.reservationType>(params: {
-    //     id: string;
-    //     previousReservationStatus: factory.reservationStatusType;
-    //     underName?: factory.reservation.IUnderName<T>;
-    // }): Promise<factory.reservation.IReservation<T>> {
-    //     const conditions = {
-    //         _id: { $eq: String(params.id) },
-    //         reservationStatus: { $eq: params.previousReservationStatus }
-    //     };
-    //     // 更新属性をwhitelist化(2022-06-13~)
-    //     const update = {
-    //         // previousReservationStatusを保管(2023-01-19~)
-    //         previousReservationStatus: params.previousReservationStatus,
-    //         reservationStatus: factory.reservationStatusType.ReservationConfirmed,
-    //         modifiedTime: new Date(),
-    //         ...(params.underName !== undefined) ? { underName: params.underName } : undefined
-    //     };
-    //     const doc = await this.reservationModel.findOneAndUpdate(
-    //         conditions,
-    //         update,
-    //         { new: true }
-    //     )
-    //         .select({ __v: 0, createdAt: 0, updatedAt: 0 })
-    //         .exec();
-    //     // NotFoundであれば状態確認
-    //     if (doc === null) {
-    //         const reservation = await this.findById<T>({ id: String(params.id) });
-    //         if (reservation.reservationStatus === factory.reservationStatusType.ReservationConfirmed) {
-    //             // すでに確定済の場合
-    //             return reservation;
-    //         } else {
-    //             throw new factory.errors.Argument(
-    //                 'id',
-    //                 `Reservation ${reservation.id} already changed -> ${reservation.reservationStatus}`
-    //             );
-    //         }
-    //     }
-    //     return doc.toObject();
-    // }
     confirmByReservationNumber(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = {
@@ -965,6 +923,14 @@ class MongoRepository {
                 .exec();
         });
     }
+    confirmByIdIfNotExist(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.reservationModel.findByIdAndUpdate({ _id: { $eq: params.reservation.id } }, {
+                $setOnInsert: Object.assign(Object.assign(Object.assign({}, params.reservation), { _id: params.reservation.id, reservationFor: params.reservationFor, reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime: new Date() }), (params.underName !== undefined) ? { underName: params.underName } : undefined)
+            })
+                .exec();
+        });
+    }
     /**
      * 予約取消
      */

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

@@ -4,6 +4,7 @@ type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservat
 export { IAcceptedAddOn };
 export declare function createStartParams(params: factory.assetTransaction.reserve.IStartParamsWithoutDetail & {
     reservationNumber: string;
+    disablePendingReservations: boolean;
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.Reserve>;
 /**
  * ポイント特典を作成する

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

@@ -12,8 +12,8 @@ function createStartParams(params) {
     var _a;
     const reservationNumber = params.reservationNumber;
     const reservationPackage = Object.assign({ 
-        // clientUser: params.object.clientUser,
-        project: params.project, reservationNumber: reservationNumber, typeOf: factory.reservationType.ReservationPackage }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined);
+        // project: params.project,
+        reservationNumber: reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, disablePendingReservations: params.disablePendingReservations, typeOf: factory.reservationType.ReservationPackage }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined);
     return {
         project: { id: params.project.id, typeOf: factory.organizationType.Project },
         typeOf: factory.assetTransactionType.Reserve,
@@ -467,7 +467,9 @@ function createPotentialActions(params) {
                 underName
             }));
         });
-        const reservationPackage = Object.assign({ reservationFor, reservationNumber: transaction.object.reservationNumber, reservationStatus: pendingReservations[0].reservationStatus, 
+        const reservationPackage = Object.assign({ reservationFor, reservationNumber: transaction.object.reservationNumber, reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
+                ? params.transaction.object.reservationStatus
+                : factory.reservationStatusType.ReservationPending, 
             // 不要なので廃止(2023-01-19~)
             // subReservation: pendingReservations,
             typeOf: factory.reservationType.ReservationPackage }, (typeof (underName === null || underName === void 0 ? void 0 : underName.typeOf) === 'string') ? { underName } : undefined);
@@ -521,11 +523,11 @@ function createMoneyTransferActions(params) {
         && typeof pointAwardToLocationIdentifier === 'string'
         && typeof pointAwardToLocationTypeOf === 'string') {
         const fromLocation = {
-            typeOf: (typeof ((_f = params.reservation.underName) === null || _f === void 0 ? void 0 : _f.typeOf) === 'string')
-                ? params.reservation.underName.typeOf
+            typeOf: (typeof ((_f = params.reservation.reservedTicket.issuedBy) === null || _f === void 0 ? void 0 : _f.typeOf) === 'string')
+                ? params.reservation.reservedTicket.issuedBy.typeOf
                 : params.transaction.typeOf,
-            name: (typeof ((_g = params.reservation.underName) === null || _g === void 0 ? void 0 : _g.name) === 'string')
-                ? params.reservation.underName.name
+            name: (typeof ((_g = params.reservation.reservedTicket.issuedBy) === null || _g === void 0 ? void 0 : _g.name) === 'string')
+                ? params.reservation.reservedTicket.issuedBy.name
                 : params.transaction.id
         };
         const toLocation = {
@@ -566,7 +568,9 @@ function createPendingReservationAction(params) {
             typeOf: factory.reservationType.ReservationPackage,
             reservationNumber: transaction.transactionNumber,
             reservationFor: { typeOf: reservationFor.typeOf, id: String(reservationFor.id) },
-            reservationStatus: pendingReservations[0].reservationStatus
+            reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
+                ? params.transaction.object.reservationStatus
+                : factory.reservationStatusType.ReservationPending
         };
         cancelActionAttributes = [{
                 project: transaction.project,

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

@@ -95,7 +95,9 @@ type IStartParams = factory.assetTransaction.reserve.IStartParamsWithoutDetail &
 /**
  * 取引開始
  */
-export declare function start(params: IStartParams): IStartOperation<{
+export declare function start(params: IStartParams & {
+    disablePendingReservations: boolean;
+}): IStartOperation<{
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
     objectSubReservations: IObjectSubReservation[];
 }>;

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

@@ -135,6 +135,20 @@ function addReservations(params) {
         })(repos);
         // 予約イベント最適化
         const reservationFor = (0, factory_1.createReservationFor)(event);
+        // const minimizedObjectSubReservations: factory.assetTransaction.reserve.IMinimizedObjectSubReservation[] =
+        //     objectSubReservations.map((r) => {
+        //         return {
+        //             id: r.id,
+        //             typeOf: r.typeOf,
+        //             reservedTicket: {
+        //                 ticketType: r.reservedTicket.ticketType,
+        //                 ...(typeof r.reservedTicket.ticketedSeat?.typeOf === 'string')
+        //                     ? { ticketedSeat: r.reservedTicket.ticketedSeat }
+        //                     : undefined
+        //             },
+        //             ...(Array.isArray(r.subReservation)) ? { subReservation: r.subReservation } : undefined
+        //         };
+        //     });
         // 取引に予約追加
         let lockedOfferRateLimitKeys = [];
         try {
@@ -147,6 +161,7 @@ function addReservations(params) {
                     reservationFor,
                     // subReservationにreservationForを保管しない(2021-10-19～)
                     subReservation: objectSubReservations
+                    // subReservation: minimizedObjectSubReservations
                 }
             });
         }
@@ -165,10 +180,12 @@ function addReservations(params) {
             reservations: objectSubReservations,
             transaction: transaction
         })(repos);
-        // 予約作成(insertManyで実装)
-        yield repos.reservation.createMany({ reservationFor, reservations: objectSubReservations });
-        // 予約作成後処理
-        yield onReservationsCreated({ event })(repos);
+        if (transaction.object.disablePendingReservations !== true) {
+            // 予約作成(insertManyで実装)
+            yield repos.reservation.createMany({ reservationFor, reservations: objectSubReservations });
+            // 予約作成後処理
+            yield onReservationsCreated({ event })(repos);
+        }
         return { transaction, objectSubReservations };
     });
 }

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

@@ -57,5 +57,6 @@ declare function authorize(params: {
          */
         id: string;
     };
+    disablePendingReservations: boolean;
 }): IAuthorizeOperation<IAuthorizeOfferAction>;
 export { authorize };

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

@@ -66,7 +66,8 @@ function authorize(params) {
                         ticketOffers,
                         unitPriceOffers,
                         validateEvent: params.validateEvent === true,
-                        validateEventOfferPeriod: params.validateEventOfferPeriod === true
+                        validateEventOfferPeriod: params.validateEventOfferPeriod === true,
+                        disablePendingReservations: params.disablePendingReservations
                     })(repos);
                     // requestBody = processStartReserveResult.requestBody;
                     // responseBody = processStartReserveResult.responseBody;
@@ -162,7 +163,7 @@ function processStartReserve4chevre(params) {
         // requestBody = startParams;
         const startParamObject = yield validateObjectWithoutDetail(startParams)(repos);
         // 予約取引開始
-        const startReserveTransactionResult = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, preSearchedEvent: event, preSearchedTicketOffers: params.ticketOffers, preSearchedUnitPriceOffers: params.unitPriceOffers, availableAtOrFrom: { id: params.availableAtOrFrom.id }, validateEvent: params.validateEvent, validateEventOfferPeriod: params.validateEventOfferPeriod, validateAppliesToMovieTicket: true }))(repos);
+        const startReserveTransactionResult = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, preSearchedEvent: event, preSearchedTicketOffers: params.ticketOffers, preSearchedUnitPriceOffers: params.unitPriceOffers, availableAtOrFrom: { id: params.availableAtOrFrom.id }, validateEvent: params.validateEvent, validateEventOfferPeriod: params.validateEventOfferPeriod, validateAppliesToMovieTicket: true, disablePendingReservations: params.disablePendingReservations }))(repos);
         responseBody = startReserveTransactionResult.transaction;
         // 予約取引からオファー情報を生成する
         acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({

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

@@ -5,7 +5,6 @@ import { RedisRepository as OfferRateLimitRepo } from '../../repo/rateLimit/offe
 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;
 /**
  * 進行中の予約をキャンセルする
  */
@@ -29,7 +28,10 @@ declare function cancelReservation(actionAttributesList: factory.action.cancel.r
     assetTransaction: AssetTransactionRepo;
 }) => Promise<void>;
 declare function processUnlockOfferRateLimit(params: {
-    reservation: Pick<IObjectSubReservation, 'reservationNumber' | 'reservedTicket'>;
+    reservation: {
+        reservationNumber: string;
+        reservedTicket: factory.assetTransaction.reserve.IObjectSubReservationReservedTicket;
+    };
     reservationFor: factory.assetTransaction.reserve.IReservationFor;
 }): (repos: {
     offerRateLimit: OfferRateLimitRepo;

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

@@ -3,6 +3,7 @@
  */
 import * as factory from '../../factory';
 import { MongoRepository as ActionRepo } from '../../repo/action';
+import { MongoRepository as AssetTrasactionRepo } from '../../repo/assetTransaction';
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
 import { MongoRepository as TaskRepo } from '../../repo/task';
 /**
@@ -10,6 +11,7 @@ import { MongoRepository as TaskRepo } from '../../repo/task';
  */
 export declare function confirmReservation(actionAttributesList: factory.action.reserve.IAttributes[]): (repos: {
     action: ActionRepo;
+    assetTransaction: AssetTrasactionRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
 }) => Promise<void>;

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

@@ -27,14 +27,41 @@ function confirmReservation(actionAttributesList) {
                 const reservation = actionAttributes.object;
                 const action = yield repos.action.start(actionAttributes);
                 try {
+                    const reserveTransactions = yield repos.assetTransaction.search({
+                        limit: 1,
+                        page: 1,
+                        typeOf: factory.assetTransactionType.Reserve,
+                        transactionNumber: { $eq: reservation.reservationNumber }
+                    });
+                    const reserveTransaction = reserveTransactions.shift();
+                    if (reserveTransaction === undefined) {
+                        throw new factory.errors.NotFound(factory.assetTransactionType.Reserve);
+                    }
                     // ReservationPackageに対応(2022-12-22~)
                     if (reservation.typeOf === factory.reservationType.ReservationPackage) {
-                        // 予約を確定状態に変更する
-                        yield repos.reservation.confirmByReservationNumber({
-                            reservationNumber: reservation.reservationNumber,
-                            previousReservationStatus: reservation.reservationStatus,
-                            underName: reservation.underName
-                        });
+                        // Pendingの予約が存在しないバージョンに対応する(2023-05-29~)
+                        if (reserveTransaction.object.disablePendingReservations === true) {
+                            const reservationFor = reserveTransaction.object.reservationFor;
+                            const subReservations = reserveTransaction.object.subReservation;
+                            if (Array.isArray(subReservations)
+                                && typeof (reservationFor === null || reservationFor === void 0 ? void 0 : reservationFor.typeOf) === 'string') {
+                                yield Promise.all(subReservations.map((subReservation) => __awaiter(this, void 0, void 0, function* () {
+                                    yield repos.reservation.confirmByIdIfNotExist({
+                                        reservation: subReservation,
+                                        reservationFor,
+                                        underName: reservation.underName
+                                    });
+                                })));
+                            }
+                        }
+                        else {
+                            // 予約を確定状態に変更する
+                            yield repos.reservation.confirmByReservationNumber({
+                                reservationNumber: reservation.reservationNumber,
+                                previousReservationStatus: reservation.reservationStatus,
+                                underName: reservation.underName
+                            });
+                        }
                     }
                     else {
                         // 廃止(2023-01-18)

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

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const action_1 = require("../../repo/action");
+const assetTransaction_1 = require("../../repo/assetTransaction");
 const reservation_1 = require("../../repo/reservation");
 const task_1 = require("../../repo/task");
 const ReserveService = require("../reserve");
@@ -19,13 +20,11 @@ const ReserveService = require("../reserve");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const reservationRepo = new reservation_1.MongoRepository(settings.connection);
-        const taskRepo = new task_1.MongoRepository(settings.connection);
         yield ReserveService.confirmReservation(data.actionAttributes)({
-            action: actionRepo,
-            reservation: reservationRepo,
-            task: taskRepo
+            action: new action_1.MongoRepository(settings.connection),
+            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+            reservation: new reservation_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection)
         });
     });
 }

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.313.0-alpha.12",
+    "@chevre/factory": "4.313.0-alpha.14",
     "@cinerino/sdk": "3.157.0-alpha.2",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -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.71"
+  "version": "21.2.0-alpha.73"
 }