@chevre/domain 27.1.0-alpha.0 → 27.1.0-alpha.2

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

@@ -2,11 +2,12 @@ import type { Connection } from 'mongoose';
 import { factory } from '../factory';
 import { IModel } from './mongoose/schemas/assetTransaction';
 import { IAcceptedOfferByReserveTransaction } from './factory/acceptedOffer/reserveTransaction2itemOffered';
-export type IAcceptedOffer = Pick<factory.order.IAcceptedOffer, 'id' | 'itemOffered' | 'offeredThrough' | 'serialNumber' | 'typeOf' | 'name'> & {
+export type IAcceptedOffer = Pick<factory.order.IAcceptedOffer, 'id' | 'itemOffered' | 'offeredThrough' | 'serialNumber' | 'typeOf'> & {
     /**
      * COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
      */
     priceSpecification?: factory.order.ITicketPriceSpecification;
+    name?: never;
 };
 /**
  * 予約取引に依存した注文オファーリポジトリ

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

@@ -11,6 +11,13 @@ type IMinimizedItemOffered = Pick<IAcceptedOffer['itemOffered'], 'additionalProp
 type IMinimizedAcceptedOffer = Pick<IAcceptedOffer, 'id' | 'name' | 'offeredThrough' | 'priceSpecification' | 'serialNumber' | 'typeOf'> & {
     itemOffered: IMinimizedItemOffered;
 };
+type IAcceptedOfferInOrder = Pick<IAcceptedOffer, 'id' | 'offeredThrough' | 'priceSpecification' | 'serialNumber' | 'typeOf'> & {
+    /**
+     * reservationFor最小化に対応
+     * 2026-09-01~
+     */
+    itemOffered: IAcceptedOffer['itemOffered'] | IMinimizedItemOffered;
+};
 /**
  * 注文オファー管理リポジトリ
  */
@@ -35,5 +42,23 @@ export declare class AdminAcceptedOfferRepo extends AcceptedOfferInReserveRepo {
         acceptedOffers: [IAcceptedOffer | IMinimizedAcceptedOffer];
         _id?: never;
     })[]>;
+    /**
+     * 注文オファーを展開して検索する
+     * 注文番号指定で1注文ドキュメントから参照する想定
+     */
+    adminFindAcceptedOffersByOrderNumber(filter: {
+        limit: number;
+        page: number;
+        orderNumber: string;
+        project: {
+            id: string;
+        };
+    }, options: {
+        /**
+         * reservationForをid属性のみにするオプション
+         * 2026-08-31~
+         */
+        minimizeReservationFor: boolean;
+    }): Promise<IAcceptedOfferInOrder[]>;
 }
 export {};

package/lib/chevre/repo/adminAcceptedOffer.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdminAcceptedOfferRepo = void 0;
 const factory_1 = require("../factory");
 const order_1 = require("./mongoose/schemas/order");
+const settings_1 = require("../settings");
 const acceptedOfferInReserve_1 = require("./acceptedOfferInReserve");
 const order_2 = require("./order");
-const settings_1 = require("../settings");
 function minimizeItemOffered(itemOffered, options) {
     const { minimizeReservationFor } = options;
     if (minimizeReservationFor) {
@@ -131,5 +131,56 @@ class AdminAcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
             });
         }
     }
+    /**
+     * 注文オファーを展開して検索する
+     * 注文番号指定で1注文ドキュメントから参照する想定
+     */
+    async adminFindAcceptedOffersByOrderNumber(filter, options) {
+        const aggregate = this.orderModel.aggregate([
+            /**
+             * unwind前に1ドキュメントを特定するためのstage
+             */
+            {
+                $match: {
+                    orderNumber: { $eq: filter.orderNumber },
+                    'project.id': { $eq: filter.project.id },
+                    typeOf: { $eq: factory_1.factory.order.OrderType.Order }
+                }
+            },
+            {
+                $unwind: {
+                    path: '$acceptedOffers'
+                    // includeArrayIndex: 'elementIndex'
+                }
+            }
+        ])
+            .project({
+            _id: 0,
+            itemOffered: '$acceptedOffers.itemOffered',
+            priceSpecification: '$acceptedOffers.priceSpecification',
+            typeOf: '$acceptedOffers.typeOf',
+            id: '$acceptedOffers.id',
+            offeredThrough: '$acceptedOffers.offeredThrough',
+            serialNumber: '$acceptedOffers.serialNumber'
+        });
+        if (typeof filter.limit === 'number' && filter.limit > 0) {
+            const page = (typeof filter.page === 'number' && filter.page > 0) ? filter.page : 1;
+            // support skip -> limit(2026-05-12~)
+            aggregate.skip(filter.limit * (page - 1))
+                .limit(filter.limit);
+        }
+        const acceptedOffers = await aggregate
+            .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .exec();
+        // 予約取引を参照(2026-05-18~)
+        const acceptedOffersWithDetails = await this.addAcceptedOffersDetails(acceptedOffers);
+        return acceptedOffersWithDetails.map((acceptedOfferWithDetails) => {
+            const { itemOffered, ...acceptedOfferWithoutItem } = acceptedOfferWithDetails;
+            return {
+                ...acceptedOfferWithoutItem,
+                itemOffered: minimizeItemOffered(itemOffered, options)
+            };
+        });
+    }
 }
 exports.AdminAcceptedOfferRepo = AdminAcceptedOfferRepo;

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js

@@ -60,11 +60,7 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
                 }
             }
             const subReservations4inform = confirmedReservations.map((r) => {
-                const { 
-                // additionalProperty: _additionalProperty,
-                // price: _price,
-                // programMembershipUsed: _programMembershipUsed,
-                additionalTicketText, id, modifiedTime, reservedTicket, subReservation, typeOf } = r;
+                const { additionalTicketText, id, modifiedTime, reservedTicket, subReservation, typeOf } = r;
                 const { ticketType: _ticketType, ...reservedTicketWithNoTicketType } = reservedTicket;
                 const reservedTicket4inform = reservedTicketWithNoTicketType;
                 return {
@@ -79,15 +75,14 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
                     // ...(!minimizeReservation && programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined, // discontinue(2026-08-01~)
                 };
             });
-            // if (typeof issuedThrough.id !== 'string') {
-            //     // COA予約では予約アクションを想定していないので、興行idは必ず存在するはず
-            //     throw new factory.errors.Internal('reservation.issuedThrough.id must be string');
-            // }
             const informObject = {
                 bookingTime,
                 project,
                 provider, // subReservationから移行(2024-03-20~)
-                reservationFor,
+                reservationFor: {
+                    id: reservationFor.id,
+                    typeOf: reservationFor.typeOf
+                },
                 reservationNumber,
                 reservationStatus: factory_1.factory.reservationStatusType.ReservationConfirmed,
                 subReservation: subReservations4inform,

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "10.4.0",
+    "@chevre/factory": "10.5.0-alpha.0",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "27.1.0-alpha.0"
+  "version": "27.1.0-alpha.2"
 }