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

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

@@ -1,8 +1,7 @@
 import { factory } from '../../../../factory';
-declare function createPotentialActions(params: {
+declare function createUnderName(params: {
     order?: Pick<factory.order.IOrder, 'orderNumber' | 'customer' | 'typeOf'>;
 }): {
-    potentialActions: factory.assetTransaction.reserve.IPotentialActions;
     underName?: factory.assetTransaction.reserve.IUnderName;
 };
-export { createPotentialActions };
+export { createUnderName };

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

@@ -1,67 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createPotentialActions = createPotentialActions;
-function createPotentialActions(params) {
-    // const transaction = params.transaction;
-    // const reservationFor = transaction.object.reservationFor;
-    // if (reservationFor === undefined) {
-    //     throw new factory.errors.NotFound('transaction.object.reservationFor');
-    // }
-    // discontinue(2024-07-01~)
-    // const useOptimizeReservation: boolean = !USE_OPTIMIZE_RESERVATION_EXCEPTIONS.includes(transaction.project.id);
-    // 予約アクション属性作成
-    // const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
-    // let reserveActionAttributes: factory.action.reserve.IAttributes[] = [];
-    // let reservationPackage: factory.action.reserve.IObject | undefined;
+exports.createUnderName = createUnderName;
+function createUnderName(params) {
     let underName;
     // purpose:Orderの指定があれば、underName,issuedByを調整(2022-05-23~)
     if (typeof params.order?.typeOf === 'string') {
         const ordre2reservationUnderNameResult = ordre2reservationUnderName({ order: params.order });
         underName = ordre2reservationUnderNameResult.underName;
     }
-    // if (pendingReservations.length > 0) {
-    //     const moneyTransferActions: factory.action.transfer.moneyTransfer.IAttributes[] = [];
-    //     pendingReservations.forEach((reservation) => {
-    //         const acceptedOffer4reservation = transaction.object.acceptedOffer?.find(
-    //             (o) => o.itemOffered?.serviceOutput?.id === reservation.id
-    //         );
-    //         moneyTransferActions.push(...createMoneyTransferActions({
-    //             acceptedOffer: acceptedOffer4reservation,
-    //             reservation,
-    //             transaction: params.transaction,
-    //             underName
-    //         }));
-    //     });
-    //     reservationPackage = {
-    //         reservationFor: {
-    //             id: String(reservationFor.id),
-    //             typeOf: reservationFor.typeOf,
-    //             optimized: true
-    //         }, // optimize(2024-01-24~)
-    //         reservationNumber: transaction.object.reservationNumber,
-    //         reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
-    //             ? params.transaction.object.reservationStatus
-    //             : factory.reservationStatusType.ReservationPending,
-    //         typeOf: factory.reservationType.ReservationPackage
-    //     };
-    //     reserveActionAttributes = [{
-    //         project: transaction.project,
-    //         typeOf: <factory.actionType.ReserveAction>factory.actionType.ReserveAction,
-    //         object: reservationPackage,
-    //         agent: transaction.project,
-    //         potentialActions: {
-    //             moneyTransfer: moneyTransferActions
-    //         },
-    //         purpose: { typeOf: transaction.typeOf, id: transaction.id }
-    //     }];
-    // }
-    return {
-        potentialActions: {
-        // reserve: reserveActionAttributes // discontinue(2024-07-01~)
-        },
-        // reservationPackage,
-        underName
-    };
+    return { underName };
 }
 /**
  * 予約のunderName.identifierを決定する
@@ -69,9 +16,6 @@ function createPotentialActions(params) {
 function createReservationUnderNameIdentifier(params) {
     // 必要最低限の識別子のみ継承する(2024-03-16~)
     let identifiersFromCustomer = (Array.isArray(params.order.customer.identifier)) ? params.order.customer.identifier : [];
-    // if (params.useOptimizeReservation) {
-    //     identifiersFromCustomer = identifiersFromCustomer.filter(({ name }) => name === 'clientId');
-    // }
     identifiersFromCustomer = identifiersFromCustomer.filter(({ name }) => name === 'clientId');
     return [
         { name: 'orderNumber', value: params.order.orderNumber },
@@ -83,15 +27,16 @@ function createReservationUnderName(params) {
         identifier: createReservationUnderNameIdentifier({ order: params.order }),
         name: String(params.order.customer.name),
         typeOf: params.order.customer.typeOf,
-        ...(typeof params.order.customer.address === 'string') ? { address: params.order.customer.address } : undefined,
-        ...(typeof params.order.customer.age === 'string') ? { age: params.order.customer.age } : undefined,
         ...(typeof params.order.customer.email === 'string') ? { email: params.order.customer.email } : undefined,
         ...(typeof params.order.customer.familyName === 'string') ? { familyName: params.order.customer.familyName } : undefined,
-        ...(typeof params.order.customer.gender === 'string') ? { gender: params.order.customer.gender } : undefined,
         ...(typeof params.order.customer.givenName === 'string') ? { givenName: params.order.customer.givenName } : undefined,
         ...(typeof params.order.customer.id === 'string') ? { id: params.order.customer.id } : undefined,
         ...(typeof params.order.customer.telephone === 'string') ? { telephone: params.order.customer.telephone } : undefined,
-        ...(typeof params.order.customer.url === 'string') ? { url: params.order.customer.url } : undefined
+        // 以下廃止(2026-11-11~)
+        // ...(typeof params.order.customer.address === 'string') ? { address: params.order.customer.address } : undefined,
+        // ...(typeof params.order.customer.age === 'string') ? { age: params.order.customer.age } : undefined,
+        // ...(typeof params.order.customer.gender === 'string') ? { gender: params.order.customer.gender } : undefined,
+        // ...(typeof params.order.customer.url === 'string') ? { url: params.order.customer.url } : undefined,
     };
 }
 /**

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

@@ -29,11 +29,7 @@ function confirm(params) {
             throw new factory_1.factory.errors.ArgumentNull('Transaction ID or Transaction Number');
         }
         const order = await fixOrderAsPurpose(params, transaction)(repos);
-        const { potentialActions, underName } = (0, factory_2.createPotentialActions)({
-            // ...params,
-            // transaction,
-            order
-        });
+        const { underName } = (0, factory_2.createUnderName)({ order });
         // 取引確定
         const result = {};
         await repos.assetTransaction.confirm({
@@ -43,7 +39,7 @@ function confirm(params) {
             // potentialActions: (USE_ASSET_TRANSACTION_SYNC_PROCESSING)
             //     ? { reserve: [] }
             //     : potentialActions, // discontinue(2024-07-01~)
-            potentialActions,
+            potentialActions: {},
             ...(typeof underName?.typeOf === 'string')
                 ? { object: { underName } }
                 : undefined

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

@@ -305,11 +305,12 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
                 ...(itemOfferedServiceOutput !== undefined) ? { serviceOutput: itemOfferedServiceOutput } : undefined,
             },
             addOn: acceptedAddOns,
-            // 追加属性をマージ
-            additionalProperty: [
-                ...(Array.isArray(offerWithoutDetail.additionalProperty)) ? offerWithoutDetail.additionalProperty : [],
-                ...(Array.isArray(offer.additionalProperty)) ? offer.additionalProperty : []
-            ]
+            // discontinue additionalProperty(2026-11-11~)
+            // // 追加属性をマージ
+            // additionalProperty: [
+            //     ...(Array.isArray(offerWithoutDetail.additionalProperty)) ? offerWithoutDetail.additionalProperty : [],
+            //     ...(Array.isArray(offer.additionalProperty)) ? offer.additionalProperty : []
+            // ]
         };
     };
 }

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

@@ -1,11 +1,12 @@
 import { factory } from '../../factory';
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AuthorizationRepo } from '../../repo/authorization';
+import type { OfferRepo } from '../../repo/offer/unitPriceInCatalog';
 import type { OrderRepo } from '../../repo/order';
 import type { ReservationRepo } from '../../repo/reservation';
 type IReservationResult = Pick<factory.reservation.eventReservation.IReservation, 'id' | 'additionalTicketText' | 'checkedIn' | 'reservationStatus'> & {
     reservedTicket: {
-        ticketType: Pick<factory.assetTransaction.reserve.ITicketType, 'identifier'> & {
+        ticketType?: Pick<factory.assetTransaction.reserve.ITicketType, 'identifier'> & {
             name: {
                 ja?: string;
             };
@@ -30,6 +31,7 @@ declare function findByCode(params: {
 }): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     authorization: AuthorizationRepo;
+    offer: OfferRepo;
     order: OrderRepo;
     reservation: ReservationRepo;
 }) => Promise<{

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

@@ -46,10 +46,22 @@ function findByCode(params) {
                     if (acceptedOffer.itemOffered.typeOf !== factory_1.factory.reservationType.EventReservation) {
                         throw new factory_1.factory.errors.Argument('id', `itemOffered.typeOf must be ${factory_1.factory.reservationType.EventReservation}`);
                     }
-                    ticketType = {
-                        identifier: acceptedOffer.itemOffered.reservedTicket.ticketType.identifier,
-                        name: { ja: acceptedOffer.itemOffered.reservedTicket.ticketType.name?.ja }
-                    };
+                    // acceptedOffer.itemOffered.reservedTicket.ticketType廃止につき、単価オファー情報を参照(2026-11-11~)
+                    const unitPriceOffer = (await repos.offer.findUnitPriceOffers({
+                        id: { $eq: String(acceptedOffer.id) },
+                        project: { id: { $eq: params.project.id } }
+                    }, { identifier: 1, name: 1 })).shift();
+                    // console.log('findByCode: unitPriceOffer found.', unitPriceOffer);
+                    if (unitPriceOffer !== undefined) {
+                        ticketType = {
+                            identifier: unitPriceOffer.identifier,
+                            name: { ja: unitPriceOffer.name?.ja }
+                        };
+                    }
+                    // ticketType = {
+                    //     identifier: acceptedOffer.itemOffered.reservedTicket.ticketType.identifier,
+                    //     name: { ja: acceptedOffer.itemOffered.reservedTicket.ticketType.name?.ja }
+                    // };
                 }
                 else {
                     throw new factory_1.factory.errors.NotFound('orderNumber');
@@ -61,21 +73,13 @@ function findByCode(params) {
         }
         const reservationFromRepo = await repos.reservation.findReservationById({
             id: reservationId,
-            inclusion: [
-                'additionalTicketText', 'checkedIn', 'reservationStatus',
-                // 'reservedTicket'
-            ]
+            inclusion: ['additionalTicketText', 'checkedIn', 'reservationStatus']
         });
         const { id, additionalTicketText, checkedIn, reservationStatus } = reservationFromRepo;
         const reservation = {
             id, reservationStatus,
             reservedTicket: {
-                // ticketTypeは注文を参照する(2026-03-25~)
-                // ticketType: {
-                //     identifier: reservedTicket.ticketType.identifier,
-                //     name: { ja: reservedTicket.ticketType.name?.ja }
-                // },
-                ticketType
+                ...((ticketType !== undefined) && { ticketType })
             },
             ...(typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined,
             ...(typeof checkedIn === 'boolean') ? { checkedIn } : undefined

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": "11.2.0-alpha.2",
+    "@chevre/factory": "11.2.0-alpha.3",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -46,7 +46,7 @@
     "csvtojson": "^2.0.10",
     "dependency-cruiser": "17.3.8",
     "eslint": "9.39.2",
-    "mongoose": "8.23.0",
+    "mongoose": "8.24.8",
     "rimraf": "6.1.3",
     "size-limit": "12.0.0",
     "typescript": "5.9.3",
@@ -55,7 +55,7 @@
   },
   "peerDependencies": {
     "@redis/client": "^6.2.1",
-    "mongoose": "^8.23.0"
+    "mongoose": "^8.24.8"
   },
   "engines": {
     "node": ">=22.0.0",
@@ -89,5 +89,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "28.2.0-alpha.0"
+  "version": "28.2.0-alpha.2"
 }