@chevre/domain 24.0.0-alpha.46 → 24.0.0-alpha.48

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

@@ -9,8 +9,8 @@ export declare function createStartParams(params: {
     project: factory.assetTransaction.IProject;
     transactionNumber: string;
     transaction?: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
-    reservations?: (Pick<factory.reservation.IReservation<factory.reservationType.EventReservation>, 'id' | 'issuedThrough' | 'typeOf' | 'reservationNumber'> & {
-        reservationFor: Pick<factory.reservation.IReservationFor<factory.reservationType.EventReservation>, 'id' | 'typeOf'>;
+    reservations?: (Pick<factory.reservation.eventReservation.IReservation, 'id' | 'issuedThrough' | 'typeOf' | 'reservationNumber'> & {
+        reservationFor: Pick<factory.reservation.eventReservation.IReservationFor, 'id' | 'typeOf'>;
     })[];
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.CancelReservation>;
 export declare function createPotentialActions(params: {

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

@@ -19,7 +19,7 @@ export declare function validateStartParams(params: IStartParams): (repos: {
 }) => Promise<{
     reserveTransaction: import("@chevre/factory/lib/assetTransaction/reserve").ITransaction | undefined;
     reservations: (Pick<import("@chevre/factory/lib/reservation/event").IReservation, "id" | "typeOf" | "issuedThrough" | "reservationNumber"> & {
-        reservationFor: Pick<factory.reservation.IReservationFor<factory.reservationType.EventReservation>, "id" | "typeOf">;
+        reservationFor: Pick<factory.reservation.eventReservation.IReservationFor, "id" | "typeOf">;
     })[] | undefined;
 }>;
 /**

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

@@ -63,7 +63,7 @@ function validateStartParams(params) {
         if (reserveTransaction === undefined) {
             // 予約存在確認
             if (typeof params.object.reservation?.id === 'string') {
-                const reservation = await repos.reservation.projectFieldsById({
+                const reservation = await repos.reservation.findReservationById({
                     id: params.object.reservation.id,
                     inclusion: [
                         'issuedThrough', 'typeOf', 'reservationNumber', 'reservationFor.id', 'reservationFor.typeOf', 'provider', 'reservationStatus'

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

@@ -3,6 +3,6 @@ declare function createPotentialActions(params: {
     order?: Pick<factory.order.IOrder, 'orderNumber' | 'customer' | 'typeOf'>;
 }): {
     potentialActions: factory.assetTransaction.reserve.IPotentialActions;
-    underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+    underName?: factory.reservation.IUnderName;
 };
 export { createPotentialActions };

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

@@ -46,8 +46,8 @@ declare function createReservation(params: {
     ticketOffer: factory.product.ITicketOffer;
     seatPriceComponent: factory.place.seat.IPriceComponent[];
     acceptedAddOns: IAcceptedAddOn[];
-    subReservation?: factory.reservation.ISubReservation<factory.reservationType.EventReservation>[];
-    programMembershipUsed?: factory.reservation.IProgramMembershipUsed<factory.reservationType.EventReservation>;
+    subReservation?: factory.reservation.eventReservation.ISubReservation[];
+    programMembershipUsed?: factory.reservation.IProgramMembershipUsed;
     availableOffer: factory.unitPriceOffer.IUnitPriceOffer;
     appliesToMovieTicket?: factory.assetTransaction.reserve.IAcceptedAppliesToMovieTicket;
     validateAppliesToMovieTicket: boolean;

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

@@ -8,7 +8,7 @@ declare function createReserveTransactionStartParams(params: {
     event: {
         id: string;
     };
-    broker?: factory.reservation.IBroker<factory.reservationType>;
+    broker?: factory.reservation.IBroker;
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'expires' | 'seller'>;
     transactionNumber: string;
 }): factory.assetTransaction.reserve.IStartParamsWithoutDetail;

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

@@ -32,7 +32,7 @@ declare function processStartReserve4chevre(params: {
             identifier?: string;
         };
     };
-    broker?: factory.reservation.IBroker<factory.reservationType>;
+    broker?: factory.reservation.IBroker;
     transactionNumber: string;
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'expires' | 'id' | 'project' | 'seller' | 'typeOf'>;
     availableAtOrFrom: {

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

@@ -36,7 +36,7 @@ declare function processUnlockOfferRateLimit(params: {
     };
     reservation: {
         reservationNumber: string;
-        reservedTicket: factory.reservation.eventReservation.IReservedTicket;
+        reservedTicket: Pick<factory.assetTransaction.reserve.ISubReservationReservedTicket, 'ticketType'>;
     };
     reservationFor: factory.assetTransaction.reserve.IReservationFor;
 }): (repos: {

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

@@ -244,7 +244,7 @@ function cancelReservation(actionAttributesList) {
                         });
                     }
                     else {
-                        const reservation = await repos.reservation.projectFieldsById({
+                        const reservation = await repos.reservation.findReservationById({
                             id: actionAttributes.object.id,
                             inclusion: ['reservationNumber', 'reservationStatus', 'project', 'reservedTicket', 'subReservation', 'reservationFor']
                         });
@@ -276,14 +276,18 @@ function cancelReservation(actionAttributesList) {
                                 expectedHolder
                             })(repos);
                         }
-                        await processUnlockOfferRateLimit({
-                            project: { id: reservation.project.id },
-                            reservation: {
-                                reservationNumber: reservation.reservationNumber,
-                                reservedTicket: reservation.reservedTicket
-                            },
-                            reservationFor: reservation.reservationFor
-                        })(repos);
+                        const subReservationByTransaction = reserveTransaction?.object.subReservation?.find((s) => s.id === reservation.id);
+                        if (subReservationByTransaction !== undefined) {
+                            await processUnlockOfferRateLimit({
+                                project: { id: reservation.project.id },
+                                reservation: {
+                                    reservationNumber: reservation.reservationNumber,
+                                    // reservedTicket: reservation.reservedTicket
+                                    reservedTicket: subReservationByTransaction.reservedTicket
+                                },
+                                reservationFor: reservation.reservationFor
+                            })(repos);
+                        }
                         // 予約をキャンセル状態に変更する
                         await repos.reservation.cancelById({
                             id: reservation.id,
@@ -332,7 +336,7 @@ function cancelReservation(actionAttributesList) {
                     }
                 }
                 else {
-                    const canceledReservation = await repos.reservation.projectFieldsById({
+                    const canceledReservation = await repos.reservation.findReservationById({
                         id: actionAttributes.object.id,
                         inclusion: ['project', 'typeOf', 'modifiedTime', 'reservationNumber']
                     });

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

@@ -65,17 +65,21 @@ function confirmReservation(params) {
                 // price,underName,ticketTypeは予約取引から補完する(2026-03-25~)
                 confirmedReservations = rawReservations.map((rawReservation) => {
                     const subReservationByTransaction = reserveTransaction.object.subReservation?.find((s) => s.id === rawReservation.id);
-                    const priceByTransaction = subReservationByTransaction?.price;
+                    // 予約取引内にsubReservationは必ず存在するはず
+                    if (subReservationByTransaction === undefined) {
+                        throw new factory.errors.NotFound('reserveTransaction.object.subReservation');
+                    }
+                    const priceByTransaction = subReservationByTransaction.price;
                     const underNameByTransaction = reserveTransaction.object.underName;
-                    const ticketTypeByTransaction = subReservationByTransaction?.reservedTicket.ticketType;
-                    console.log('creating confirmedReservation...', rawReservation, priceByTransaction, underNameByTransaction, ticketTypeByTransaction);
+                    const ticketTypeByTransaction = subReservationByTransaction.reservedTicket.ticketType;
+                    // console.log('creating confirmedReservation...', rawReservation, priceByTransaction, underNameByTransaction, ticketTypeByTransaction);
                     return {
                         ...rawReservation,
-                        ...(priceByTransaction) ? { price: priceByTransaction } : undefined,
-                        ...(underNameByTransaction !== undefined) ? { underName: underNameByTransaction } : undefined,
+                        price: priceByTransaction,
+                        underName: underNameByTransaction,
                         reservedTicket: {
                             ...rawReservation.reservedTicket,
-                            ...(ticketTypeByTransaction !== undefined) ? { ticketType: ticketTypeByTransaction } : undefined
+                            ticketType: ticketTypeByTransaction
                         }
                     };
                 });

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

@@ -1,6 +1,6 @@
 import * as factory from '../../factory';
 export declare function optimizeUnderName4inform(params: {
-    underName: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+    underName: factory.reservation.IUnderName;
 }): factory.notification.reservation.IMaskedUnderName;
 export type IPotentialInformReservationAction = factory.task.triggerWebhook.IPotentialInformReservationAction;
 export declare const NUM_TRY_INFORM_RESERVATION = 10;
@@ -8,7 +8,7 @@ export declare function createMoneyTransferActions(params: {
     acceptedOffer?: factory.assetTransaction.reserve.IAcceptedOffer4object;
     reservation: Pick<factory.assetTransaction.reserve.IObjectSubReservation, 'reservedTicket'>;
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
-    underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+    underName?: factory.reservation.IUnderName;
 }): import("@chevre/factory/lib/action/transfer/moneyTransfer").IAttributes[];
 export interface IPotentialCancelAction extends factory.action.cancel.reservation.IAttributes {
     purpose: {

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

@@ -3,8 +3,7 @@ import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AuthorizationRepo } from '../../repo/authorization';
 import type { OrderRepo } from '../../repo/order';
 import type { ReservationRepo } from '../../repo/reservation';
-type AvailableReservationType = factory.reservationType.EventReservation;
-type IReservationResult = Pick<factory.reservation.IReservation<AvailableReservationType>, 'id' | 'additionalTicketText' | 'checkedIn' | 'reservationStatus'> & {
+type IReservationResult = Pick<factory.reservation.eventReservation.IReservation, 'id' | 'additionalTicketText' | 'checkedIn' | 'reservationStatus'> & {
     reservedTicket: {
         ticketType: Pick<factory.reservation.eventReservation.ITicketType, 'identifier'> & {
             name: {

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

@@ -82,7 +82,7 @@ function findByCode(params) {
             default:
                 throw new factory.errors.NotImplemented(`authorization object typeOf: ${authorization.object.typeOf} not implemented`);
         }
-        const reservationFromRepo = await repos.reservation.projectFieldsById({
+        const reservationFromRepo = await repos.reservation.findReservationById({
             id: reservationId,
             inclusion: [
                 'additionalTicketText', 'checkedIn', 'reservationStatus',

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

@@ -0,0 +1,19 @@
+import * as factory from '../../factory';
+import type { ReserveTransactionRepo } from '../../repo/assetTransaction/reserve';
+import type { IDeprecatedField, IKeyOfProjection, ReservationRepo } from '../../repo/reservation';
+type IReservationAsFindResult = Omit<factory.reservation.eventReservation.IReservation, 'price'> & {
+    price?: factory.reservation.eventReservation.IPrice;
+};
+/**
+ * 予約を検索する
+ */
+export declare function findReservations(params: factory.reservation.eventReservation.ISearchConditions, options: {
+    inclusion: Partial<Record<IKeyOfProjection | IDeprecatedField, 1>>;
+    useReserveTransaction: boolean;
+}): (repos: {
+    assetTransaction: {
+        reserve: ReserveTransactionRepo;
+    };
+    reservation: ReservationRepo;
+}) => Promise<IReservationAsFindResult[]>;
+export {};

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

@@ -0,0 +1,74 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findReservations = findReservations;
+const debug_1 = __importDefault(require("debug"));
+const util_1 = require("util");
+const debug = (0, debug_1.default)('chevre-domain:service:reserve:findReservations');
+/**
+ * 予約を検索する
+ */
+function findReservations(params, options) {
+    return async (repos) => {
+        const { inclusion, useReserveTransaction } = options;
+        let reservations = await repos.reservation.findReservations(params, inclusion);
+        if (useReserveTransaction) {
+            if (reservations.length > 0) {
+                const requirePrice = Object.keys(inclusion).includes('price');
+                const requireUnderName = Object.keys(inclusion).includes('underName');
+                const requireReservedTicket = Object.keys(inclusion).includes('reservedTicket');
+                const reservationIds = reservations.map(({ id }) => id);
+                const subReservations = await repos.assetTransaction.reserve.findSubReservationsById({
+                    ids: reservationIds
+                });
+                // 予約取引から参照した予約数と同じはず
+                debug('useReserveTransaction: true. reservations.length === subReservations.length?', reservations.length === subReservations.length);
+                reservations = reservations.map((reservation) => {
+                    const subReservationByTransaction = subReservations.find((s) => s.id === reservation.id);
+                    const priceByTransaction = subReservationByTransaction?.price;
+                    const underNameByTransaction = subReservationByTransaction?.underName;
+                    const ticketTypeByTransaction = subReservationByTransaction?.reservedTicket?.ticketType;
+                    // 予約取引から参照した属性と全く等しいはず
+                    if (requirePrice) {
+                        const priceMatched = (0, util_1.isDeepStrictEqual)(reservation.price, priceByTransaction);
+                        debug('requirePrice. priceMatched?', priceMatched);
+                        if (!priceMatched) {
+                            console.error('priceMatched: false!!!', reservation.id);
+                        }
+                    }
+                    if (requireUnderName) {
+                        const underNameMatched = (0, util_1.isDeepStrictEqual)(reservation.underName, underNameByTransaction);
+                        debug('requireUnderName. underNameMatched?', underNameMatched);
+                        if (!underNameMatched) {
+                            console.error('underNameMatched: false!!!', reservation.id);
+                        }
+                    }
+                    if (requireReservedTicket) {
+                        const ticketTypeMatched = (0, util_1.isDeepStrictEqual)(reservation.reservedTicket.ticketType, ticketTypeByTransaction);
+                        debug('requireReservedTicket. ticketTypeMatched?', ticketTypeMatched);
+                        if (!ticketTypeMatched) {
+                            console.error('ticketTypeMatched: false!!!', reservation.id);
+                        }
+                    }
+                    return {
+                        ...reservation, // 予約ドキュメントはそのまま返す
+                        ...(requirePrice && priceByTransaction !== undefined) ? { price: priceByTransaction } : undefined, // priceがあれば上書き
+                        ...(requireUnderName && underNameByTransaction !== undefined) ? { underName: underNameByTransaction } : undefined, // underNameがあれば上書き
+                        ...(requireReservedTicket && ticketTypeByTransaction !== undefined) // ticketTypeがあれば上書き
+                            ? {
+                                reservedTicket: {
+                                    ...reservation.reservedTicket, // 予約ドキュメントのreservedTicketはそのまま返す
+                                    ticketType: ticketTypeByTransaction
+                                }
+                            }
+                            : undefined
+                    };
+                });
+            }
+            ;
+        }
+        return reservations;
+    };
+}

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

@@ -4,7 +4,7 @@
 import * as factory from '../../../factory';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-export type ICanceledEventReservation = Pick<factory.reservation.IReservation<factory.reservationType.EventReservation>, 'project' | 'id' | 'typeOf' | 'modifiedTime' | 'reservationNumber'>;
+export type ICanceledEventReservation = Pick<factory.reservation.eventReservation.IReservation, 'project' | 'id' | 'typeOf' | 'modifiedTime' | 'reservationNumber'>;
 export declare function onReservationCanceled(
 /**
  * ステータス変更された予約リスト

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

@@ -5,9 +5,12 @@ import * as factory from '../../../factory';
 import { AuthorizationRepo } from '../../../repo/authorization';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-export type IConfirmedReservation = Omit<factory.reservation.eventReservation.IReservation, 'price' | 'underName'> & {
+export type IConfirmedReservation = Omit<factory.reservation.eventReservation.IReservation, 'price' | 'underName' | 'reservedTicket'> & {
     price?: factory.reservation.eventReservation.IPrice;
-    underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+    underName?: factory.reservation.IUnderName;
+    reservedTicket: Omit<factory.assetTransaction.reserve.ISubReservationReservedTicket, 'ticketType'> & {
+        ticketType: factory.reservation.eventReservation.ITicketType;
+    };
 };
 /**
  * 予約確定後のアクション

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

@@ -3,7 +3,7 @@ import * as factory from '../../factory';
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { OrderRepo } from '../../repo/order';
 import type { ReservationRepo } from '../../repo/reservation';
-type IReservationResult = Pick<factory.reservation.IReservation<factory.reservationType>, 'id' | 'additionalTicketText' | 'reservationStatus'>;
+type IReservationResult = Pick<factory.reservation.eventReservation.IReservation, 'id' | 'additionalTicketText' | 'reservationStatus'>;
 declare function searchByOrder(params: {
     limit: number;
     page: number;

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

@@ -55,7 +55,7 @@ function useReservation(params) {
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
         await reserveIfNotYet({ object: params.object })(repos);
         // 予約検索
-        const reservation = await repos.reservation.projectFieldsById({
+        const reservation = await repos.reservation.findReservationById({
             id: reservationId,
             inclusion: ['issuedThrough', 'project', 'reservationFor', 'reservationNumber', 'reservedTicket', 'typeOf']
         });

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

@@ -5,6 +5,7 @@ import { cancelPendingReservation, cancelReservation } from './reserve/cancelRes
 import { checkInReservation } from './reserve/checkInReservation';
 import { confirmReservation } from './reserve/confirmReservation';
 import { findByCode } from './reserve/findByCode';
+import { findReservations } from './reserve/findReservations';
 import { searchByOrder } from './reserve/searchByOrder';
 import { verifyToken4reservation } from './reserve/verifyToken4reservation';
-export { cancelPendingReservation, cancelReservation, checkInReservation, confirmReservation, findByCode, searchByOrder, verifyToken4reservation };
+export { cancelPendingReservation, cancelReservation, checkInReservation, confirmReservation, findByCode, findReservations, searchByOrder, verifyToken4reservation };

package/lib/chevre/service/reserve.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyToken4reservation = exports.searchByOrder = exports.findByCode = exports.confirmReservation = exports.checkInReservation = exports.cancelReservation = exports.cancelPendingReservation = void 0;
+exports.verifyToken4reservation = exports.searchByOrder = exports.findReservations = exports.findByCode = exports.confirmReservation = exports.checkInReservation = exports.cancelReservation = exports.cancelPendingReservation = void 0;
 /**
  * 予約サービス
  */
@@ -13,6 +13,8 @@ const confirmReservation_1 = require("./reserve/confirmReservation");
 Object.defineProperty(exports, "confirmReservation", { enumerable: true, get: function () { return confirmReservation_1.confirmReservation; } });
 const findByCode_1 = require("./reserve/findByCode");
 Object.defineProperty(exports, "findByCode", { enumerable: true, get: function () { return findByCode_1.findByCode; } });
+const findReservations_1 = require("./reserve/findReservations");
+Object.defineProperty(exports, "findReservations", { enumerable: true, get: function () { return findReservations_1.findReservations; } });
 const searchByOrder_1 = require("./reserve/searchByOrder");
 Object.defineProperty(exports, "searchByOrder", { enumerable: true, get: function () { return searchByOrder_1.searchByOrder; } });
 const verifyToken4reservation_1 = require("./reserve/verifyToken4reservation");

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "6.0.0-alpha.9",
-    "@cinerino/sdk": "13.3.0",
+    "@chevre/factory": "6.0.0",
+    "@cinerino/sdk": "13.3.1",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
     "@sendgrid/client": "8.1.4",
@@ -99,5 +99,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.0.0-alpha.46"
+  "version": "24.0.0-alpha.48"
 }