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

package/lib/chevre/repository.d.ts

@@ -27,6 +27,7 @@ import type { AggregateOrderRepo } from './repo/aggregateOrder';
 import type { AggregateReservationRepo } from './repo/aggregateReservation';
 import type { AggregationRepo } from './repo/aggregation';
 import type { AssetTransactionRepo } from './repo/assetTransaction';
+import type { ReserveTransactionRepo } from './repo/assetTransaction/reserve';
 import type { AuthorizationRepo } from './repo/authorization';
 import type { CategoryCodeRepo } from './repo/categoryCode';
 import type { CommentRepo } from './repo/comment';
@@ -211,6 +212,12 @@ export type AssetTransaction = AssetTransactionRepo;
 export declare namespace AssetTransaction {
     function createInstance(...params: ConstructorParameters<typeof AssetTransactionRepo>): Promise<AssetTransactionRepo>;
 }
+export declare namespace assetTransaction {
+    type Reserve = ReserveTransactionRepo;
+    namespace Reserve {
+        function createInstance(...params: ConstructorParameters<typeof ReserveTransactionRepo>): Promise<ReserveTransactionRepo>;
+    }
+}
 export type CategoryCode = CategoryCodeRepo;
 export declare namespace CategoryCode {
     function createInstance(...params: ConstructorParameters<typeof CategoryCodeRepo>): Promise<CategoryCodeRepo>;

package/lib/chevre/repository.js

@@ -23,8 +23,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.MovieTicketType = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AggregateAction = exports.AdvanceBookingRequirement = exports.AdditionalProperty = exports.action = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedPaymentMethod = exports.AcceptedOffer = void 0;
-exports.WebSite = exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Permit = exports.Person = exports.paymentMethod = exports.PendingReservation = exports.PaymentServiceProvider = void 0;
+exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.MovieTicketType = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.assetTransaction = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AggregateAction = exports.AdvanceBookingRequirement = exports.AdditionalProperty = exports.action = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedPaymentMethod = exports.AcceptedOffer = void 0;
+exports.WebSite = exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Permit = exports.Person = exports.paymentMethod = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -314,6 +314,20 @@ var AssetTransaction;
     }
     AssetTransaction.createInstance = createInstance;
 })(AssetTransaction || (exports.AssetTransaction = AssetTransaction = {}));
+var assetTransaction;
+(function (assetTransaction) {
+    let Reserve;
+    (function (Reserve) {
+        let repo;
+        async function createInstance(...params) {
+            if (repo === undefined) {
+                repo = (await Promise.resolve().then(() => __importStar(require('./repo/assetTransaction/reserve')))).ReserveTransactionRepo;
+            }
+            return new repo(...params);
+        }
+        Reserve.createInstance = createInstance;
+    })(Reserve = assetTransaction.Reserve || (assetTransaction.Reserve = {}));
+})(assetTransaction || (exports.assetTransaction = assetTransaction = {}));
 var CategoryCode;
 (function (CategoryCode) {
     let repo;

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/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']
                         });
@@ -319,10 +319,11 @@ function cancelReservation(actionAttributesList) {
                     const reservationNumber = actionAttributes.object.reservationNumber;
                     if (typeof reservationNumber === 'string' && reservationNumber.length > 0) {
                         // 最新のconfirmedReservationsを検索
-                        canceledReservations = await repos.reservation.projectFields({
+                        canceledReservations = await repos.reservation.findReservations({
                             reservationNumber: { $eq: reservationNumber },
                             typeOf: factory.reservationType.EventReservation
-                        }, { project: 1, typeOf: 1, modifiedTime: 1, reservationNumber: 1 });
+                        }, { project: 1, typeOf: 1, modifiedTime: 1, reservationNumber: 1 } // 廃止属性の影響なし(2026-03-25~)
+                        );
                         canceledReservations = canceledReservations.map((r) => {
                             // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
                             delete r._id;
@@ -331,7 +332,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

@@ -45,7 +45,7 @@ function confirmReservation(params) {
         //         await onReservationConfirmedByAction(actionAttributes)({ task: repos.task });
         //     }
         // }));
-        const actionAttributes = await reserveIfNotYet(params.potentialReserveAction, { byTask: params.byTask })(repos);
+        const { actionAttributes, reserveTransaction } = await reserveIfNotYet(params.potentialReserveAction, { byTask: params.byTask })(repos);
         if (params.useOnReservationConfirmed) {
             await (0, onReservationConfirmed_1.onReservationConfirmedByAction)(actionAttributes)({ task: repos.task });
         }
@@ -55,13 +55,30 @@ function confirmReservation(params) {
             const reservationNumber = params.potentialReserveAction.object.reservationNumber;
             if (typeof reservationNumber === 'string' && reservationNumber.length > 0) {
                 // 最新のconfirmedReservationsを検索
-                confirmedReservations = await repos.reservation.projectFields({
+                const rawReservations = await repos.reservation.findReservations({
                     reservationNumber: { $eq: reservationNumber },
                     typeOf: factory.reservationType.EventReservation
                 }
                 // project all fields
                 // {}
                 );
+                // 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;
+                    const underNameByTransaction = reserveTransaction.object.underName;
+                    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,
+                        reservedTicket: {
+                            ...rawReservation.reservedTicket,
+                            ...(ticketTypeByTransaction !== undefined) ? { ticketType: ticketTypeByTransaction } : undefined
+                        }
+                    };
+                });
                 confirmedReservations = confirmedReservations.map((r) => {
                     // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
                     delete r._id;
@@ -211,6 +228,6 @@ params, options) {
             const actionResult = {};
             await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
         }
-        return actionAttributes;
+        return { actionAttributes, reserveTransaction };
     };
 }

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/onReservationConfirmed.d.ts

@@ -5,16 +5,18 @@ import * as factory from '../../../factory';
 import { AuthorizationRepo } from '../../../repo/authorization';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-type IEventReservation = factory.reservation.IReservation<factory.reservationType.EventReservation>;
+export type IConfirmedReservation = Omit<factory.reservation.eventReservation.IReservation, 'price' | 'underName'> & {
+    price?: factory.reservation.eventReservation.IPrice;
+    underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+};
 /**
  * 予約確定後のアクション
  */
 export declare function onReservationConfirmedByAction(actionAttributes: Pick<factory.action.reserve.IAttributes, 'potentialActions'>): (repos: {
     task: TaskRepo;
 }) => Promise<void>;
-export declare function onReservationConfirmed(confirmedReservations: IEventReservation[], reserveAction: Pick<factory.action.reserve.IAttributes, 'instrument'>): (repos: {
+export declare function onReservationConfirmed(confirmedReservations: IConfirmedReservation[], reserveAction: Pick<factory.action.reserve.IAttributes, 'instrument'>): (repos: {
     code: AuthorizationRepo;
     setting: SettingRepo;
     task: TaskRepo;
 }) => Promise<void>;
-export {};

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

@@ -104,11 +104,12 @@ function searchByOrder(params) {
                     break;
                 }
                 default:
-                    reservations = await repos.reservation.projectFields({
+                    reservations = await repos.reservation.findReservations({
                         project: { id: { $eq: params.project.id } },
                         typeOf: reservationType,
                         id: { $in: reservationIds }
-                    }, { id: 1, additionalTicketText: 1, reservationStatus: 1 });
+                    }, { id: 1, additionalTicketText: 1, reservationStatus: 1 } // 廃止属性の影響なし(2026-03-25~)
+                    );
             }
         }
         return { reservations };

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/lib/chevre/service/transaction/returnOrder/preStart.js

@@ -196,13 +196,14 @@ function checkUsedReservationExists(params) {
         }, 'acceptedOffers.itemOffered.reservationNumber');
         if (reservationNumbers.length > 0) {
             // 使用済の予約がひとつでもあれば不可
-            const existingUsedReservations = await repos.reservation.projectFields({
+            const existingUsedReservations = await repos.reservation.findReservations({
                 limit: 1,
                 page: 1,
                 typeOf: factory.reservationType.EventReservation,
                 reservationNumber: { $in: reservationNumbers },
                 attended: true
-            }, { id: 1 });
+            }, { id: 1 } // 廃止属性の影響なし(2026-03-25~)
+            );
             if (existingUsedReservations.length > 0) {
                 usedReservationExists = true;
             }

package/package.json

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