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

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

@@ -1,3 +1,3 @@
 import type { FilterQuery } from 'mongoose';
 import * as factory from '../../../factory';
-export declare function CREATE_MONGO_CONDITIONS(params: factory.reservation.ISearchConditions<factory.reservationType>): FilterQuery<import("@chevre/factory/lib/reservation/event").IReservation | import("@chevre/factory/lib/reservation/reservationPackage").IReservation>[];
+export declare function CREATE_MONGO_CONDITIONS(params: factory.reservation.eventReservation.ISearchConditions): FilterQuery<import("@chevre/factory/lib/reservation/event").IReservation>[];

package/lib/chevre/repo/factory/reservation/createMongoConditions.js

@@ -407,8 +407,8 @@ function CREATE_MONGO_CONDITIONS(params) {
                 }
             }
             break;
-        case factory.reservationType.ReservationPackage:
-            break;
+        // case factory.reservationType.ReservationPackage:
+        //     break;
         default:
     }
     /* istanbul ignore else */

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

@@ -1,7 +1,7 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import { IVirtuals } from '../virtuals';
 import * as factory from '../../../factory';
-type IDocType = (Omit<factory.reservation.IReservation<factory.reservationType.EventReservation>, 'id'>) & {
+type IDocType = (Omit<factory.reservation.eventReservation.IReservation, 'id'>) & {
     _id: string;
     bookingAgent?: any;
     previousReservationStatus?: factory.reservationStatusType;

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

@@ -7,16 +7,21 @@ export interface IUpdatePartiallyParams {
 }
 export type ICancelResult = UpdateWriteOpResult;
 export type ICheckedInResult = UpdateWriteOpResult;
-export type ICreatingReservation<T extends factory.reservationType> = T extends factory.reservationType.EventReservation ? (Omit<factory.reservation.eventReservation.IReservation, 'id'>) & {
+export type ICreatingReservation = Omit<factory.reservation.eventReservation.IReservation, 'id' | 'price' | 'reservedTicket'> & {
     _id: string;
-} : never;
+    /**
+     * priceは廃止予定だが、互換性維持対応としてひとまず型を強制的に合わせる
+     */
+    price?: factory.reservation.eventReservation.IPrice;
+    reservedTicket: factory.assetTransaction.reserve.ISubReservationReservedTicket;
+};
 /**
  * 廃止予定の予約属性
  */
 export type IDeprecatedField = 'price' | 'underName';
 export type IKeyOfProjection = Exclude<keyof factory.reservation.eventReservation.IReservation, IDeprecatedField> | 'reservedTicket.dateUsed' | 'reservationFor.id' | 'reservationFor.typeOf';
-export type IAttendedReservation = Pick<factory.reservation.IReservation<factory.reservationType.EventReservation>, 'id' | 'typeOf' | 'project' | 'modifiedTime'> & {
-    reservationFor: Pick<factory.reservation.IReservationFor<factory.reservationType.EventReservation>, 'id' | 'typeOf'>;
+export type IAttendedReservation = Pick<factory.reservation.eventReservation.IReservation, 'id' | 'typeOf' | 'project' | 'modifiedTime'> & {
+    reservationFor: Pick<factory.reservation.eventReservation.IReservationFor, 'id' | 'typeOf'>;
     reservedTicket: Pick<factory.reservation.eventReservation.IReservedTicket, 'dateUsed'>;
 };
 export type IReservationAsFindResult = Omit<factory.reservation.eventReservation.IReservation, IDeprecatedField> & {
@@ -38,7 +43,7 @@ export declare class ReservationRepo {
     /**
      * 汎用予約カウント
      */
-    count<T extends factory.reservationType>(params: factory.reservation.ISearchConditions<T>): Promise<number>;
+    count(params: factory.reservation.eventReservation.ISearchConditions): Promise<number>;
     /**
      * 予約検索
      */
@@ -57,13 +62,13 @@ export declare class ReservationRepo {
         issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
         reservationFor: factory.assetTransaction.reserve.IReservationFor;
         reservationNumber: string;
-        underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
-        broker?: factory.reservation.IBroker<factory.reservationType>;
+        underName?: factory.reservation.IUnderName;
+        broker?: factory.reservation.IBroker;
     }): Promise<BulkWriteResult | undefined>;
     /**
      * 予約取消
      */
-    cancelById<T extends factory.reservationType>(params: {
+    cancelById(params: {
         id: string;
         previousReservationStatus?: factory.reservationStatusType;
         modifiedTime: Date;

package/lib/chevre/repo/reservation.js

@@ -140,7 +140,7 @@ class ReservationRepo {
                 switch (subReservation.typeOf) {
                     case factory.reservationType.EventReservation:
                         setOnInsert = {
-                            ...subReservation, // priceは廃止予定だが、互換性維持対応としてひとまず型を強制的に合わせる
+                            ...subReservation,
                             _id: subReservation.id,
                             bookingTime: params.bookingTime,
                             checkedIn: false,

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/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

@@ -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,

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;
+                    const ticketTypeByTransaction = subReservationByTransaction.reservedTicket.ticketType;
                     // console.log('creating confirmedReservation...', rawReservation, priceByTransaction, underNameByTransaction, ticketTypeByTransaction);
                     return {
                         ...rawReservation,
-                        ...(priceByTransaction !== undefined) ? { 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/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/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.47"
+  "version": "24.0.0-alpha.48"
 }