@chevre/domain 21.2.0-alpha.77 → 21.2.0-alpha.78

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

@@ -75,6 +75,7 @@ export declare class MongoRepository {
     confirm<T extends factory.assetTransactionType>(params: {
         typeOf: T;
         id: string;
+        object?: Pick<factory.action.reserve.IReservationPackageAsObject, 'underName'>;
         result: factory.assetTransaction.IResult<T>;
         potentialActions: factory.assetTransaction.IPotentialActions<T>;
     }): Promise<void>;

package/lib/chevre/repo/assetTransaction.js

@@ -311,17 +311,15 @@ class MongoRepository {
      * 取引を確定する
      */
     confirm(params) {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.transactionModel.findOneAndUpdate({
                 _id: { $eq: params.id },
                 typeOf: { $eq: params.typeOf },
                 status: { $eq: factory.transactionStatusType.InProgress }
-            }, {
-                status: factory.transactionStatusType.Confirmed,
-                endDate: new Date(),
-                result: params.result,
-                potentialActions: params.potentialActions // resultを更新
-            }, {
+            }, Object.assign({ status: factory.transactionStatusType.Confirmed, endDate: new Date(), result: params.result, potentialActions: params.potentialActions }, (typeof ((_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.underName) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')
+                ? { 'object.underName': (_c = params.object) === null || _c === void 0 ? void 0 : _c.underName }
+                : undefined), {
                 new: true,
                 projection: { _id: 1 }
             })

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

@@ -65,6 +65,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     broker?: any;
     price?: any;
     priceCurrency?: string | undefined;
+    underName?: any;
     issuedThrough?: any;
     reservedTicket?: any;
     additionalTicketText?: string | undefined;
@@ -72,7 +73,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     modifiedTime?: Date | undefined;
     numSeats?: number | undefined;
     programMembershipUsed?: any;
-    underName?: any;
     bookingAgent?: any;
     cancelReservationUrl?: string | undefined;
     checkinUrl?: string | undefined;
@@ -93,6 +93,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     broker?: any;
     price?: any;
     priceCurrency?: string | undefined;
+    underName?: any;
     issuedThrough?: any;
     reservedTicket?: any;
     additionalTicketText?: string | undefined;
@@ -100,7 +101,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     modifiedTime?: Date | undefined;
     numSeats?: number | undefined;
     programMembershipUsed?: any;
-    underName?: any;
     bookingAgent?: any;
     cancelReservationUrl?: string | undefined;
     checkinUrl?: string | undefined;
@@ -121,6 +121,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     broker?: any;
     price?: any;
     priceCurrency?: string | undefined;
+    underName?: any;
     issuedThrough?: any;
     reservedTicket?: any;
     additionalTicketText?: string | undefined;
@@ -128,7 +129,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     modifiedTime?: Date | undefined;
     numSeats?: number | undefined;
     programMembershipUsed?: any;
-    underName?: any;
     bookingAgent?: any;
     cancelReservationUrl?: string | undefined;
     checkinUrl?: string | undefined;

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

@@ -86,7 +86,9 @@ export declare class MongoRepository {
     /**
      * 注文を検索する
      */
-    search(params: factory.order.ISearchConditions, projection?: any): Promise<factory.order.IOrder[]>;
+    search(params: factory.order.ISearchConditions, projection?: {
+        [key: string]: 0 | 1;
+    }): Promise<factory.order.IOrder[]>;
     /**
      * 注文の受入オファーIDリストを検索する
      */

package/lib/chevre/repo/order.js

@@ -896,8 +896,15 @@ class MongoRepository {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
+            const projectionSpecified = projection !== undefined && projection !== null;
+            const positiveProjectionExists = (projectionSpecified)
+                ? Object.values(projection)
+                    .some((value) => value !== 0)
+                : false;
             const query = this.orderModel.find((conditions.length > 0) ? { $and: conditions } : {})
-                .select(Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
+                .select((projectionSpecified && positiveProjectionExists)
+                ? projection
+                : Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
                 query.limit(params.limit)

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

@@ -71,8 +71,11 @@ export declare function createReservation(params: {
 }): IObjectSubReservation;
 export declare function createPotentialActions(params: factory.assetTransaction.reserve.IConfirmParams & {
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
-    order?: factory.order.IOrder;
-}): factory.assetTransaction.reserve.IPotentialActions;
+    order?: Pick<factory.order.IOrder, 'orderNumber' | 'customer' | 'typeOf'>;
+}): {
+    potentialActions: factory.assetTransaction.reserve.IPotentialActions;
+    reservationPackage?: factory.action.reserve.IReservationPackageAsObject;
+};
 export declare function createPendingReservationAction(params: {
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
 }): factory.action.cancel.reservation.IAttributes[];

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

@@ -448,6 +448,7 @@ function createPotentialActions(params) {
     // 予約アクション属性作成
     const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
     let reserveActionAttributes = [];
+    let reservationPackage;
     if (pendingReservations.length > 0) {
         // ReservationPackageに対応(2022-12-22~)
         let underName;
@@ -467,7 +468,7 @@ function createPotentialActions(params) {
                 underName
             }));
         });
-        const reservationPackage = Object.assign({ reservationFor, reservationNumber: transaction.object.reservationNumber, reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
+        reservationPackage = Object.assign({ reservationFor, reservationNumber: transaction.object.reservationNumber, reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
                 ? params.transaction.object.reservationStatus
                 : factory.reservationStatusType.ReservationPending, 
             // 不要なので廃止(2023-01-19~)
@@ -486,7 +487,10 @@ function createPotentialActions(params) {
             }];
     }
     return {
-        reserve: reserveActionAttributes
+        potentialActions: {
+            reserve: reserveActionAttributes
+        },
+        reservationPackage
     };
 }
 exports.createPotentialActions = createPotentialActions;
@@ -505,10 +509,6 @@ function createReservationUnderName(params) {
  */
 function ordre2reservationUnderName(params) {
     return {
-        // issuedBy: {
-        //     typeOf: params.order.seller.typeOf,
-        //     name: params.order.seller.name
-        // },
         underName: createReservationUnderName({ order: params.order })
     };
 }

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

@@ -698,6 +698,7 @@ function onReservationsCreated(params) {
  */
 function confirm(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         let transaction;
         // 取引存在確認
         if (typeof params.id === 'string') {
@@ -716,17 +717,14 @@ function confirm(params) {
             throw new factory.errors.ArgumentNull('Transaction ID or Transaction Number');
         }
         const order = yield fixOrderAsPurpose(params, transaction)(repos);
-        const potentialActions = (0, factory_1.createPotentialActions)(Object.assign(Object.assign({}, params), { transaction: transaction, order }));
+        const { potentialActions, reservationPackage } = (0, factory_1.createPotentialActions)(Object.assign(Object.assign({}, params), { transaction: transaction, order }));
         // 取引確定
         const result = {};
-        yield repos.assetTransaction.confirm({
-            typeOf: factory.assetTransactionType.Reserve,
-            id: transaction.id,
-            result: result,
-            potentialActions: (settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING)
+        yield repos.assetTransaction.confirm(Object.assign({ typeOf: factory.assetTransactionType.Reserve, id: transaction.id, result: result, potentialActions: (settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING)
                 ? { reserve: [] }
-                : potentialActions
-        });
+                : potentialActions }, (typeof ((_a = reservationPackage === null || reservationPackage === void 0 ? void 0 : reservationPackage.underName) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+            ? { object: { underName: reservationPackage.underName } }
+            : undefined));
         if (settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING) {
             // sync対応(2023-01-13~)
             yield (0, confirmReservation_1.confirmReservation)(potentialActions.reserve)(repos);
@@ -750,7 +748,7 @@ function fixOrderAsPurpose(params, transaction) {
                 project: { id: { $eq: transaction.project.id } },
                 confirmationNumbers: [payPurposeConfirmationNumber],
                 orderNumbers: [payPurposeOrderNumber]
-            });
+            }, { customer: 1, orderNumber: 1, typeOf: 1 });
             order = orders.shift();
             if (order === undefined) {
                 throw new factory.errors.NotFound('Order as purpose');

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

@@ -1,6 +1,3 @@
-/**
- * 予約サービス
- */
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
 import { MongoRepository as TaskRepo } from '../../repo/task';
 export declare function checkInRerservation(params: {

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

@@ -1,4 +1,5 @@
 "use strict";
+// import * as factory from '../../factory';
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -10,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkInRerservation = void 0;
+// import { confirmReservation } from './confirmReservation';
 const onReservationCheckedIn_1 = require("./potentialActions/onReservationCheckedIn");
 function checkInRerservation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -17,6 +19,28 @@ function checkInRerservation(params) {
         // 発券処理(Array対応)
         let checkedInReservationIds;
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
+            //  confirmReservationが間に合わない可能性を考慮する(2023-05-30~)
+            // const reserveTransactions = await repos.assetTransaction.search<factory.assetTransactionType.Reserve>({
+            //     typeOf: factory.assetTransactionType.Reserve,
+            //     object: {
+            //         reservations: {
+            //             id: { $in: params.object.ids }
+            //         }
+            //     }
+            // });
+            // await Promise.all(reserveTransactions.map(async (reserveTransaction) => {
+            //     await confirmReservation([{
+            //         project: reserveTransaction.project,
+            //         typeOf: <factory.actionType.ReserveAction>factory.actionType.ReserveAction,
+            //         // result: {},
+            //         object: reservationPackage,
+            //         agent: reserveTransaction.project,
+            //         potentialActions: {
+            //             moneyTransfer: moneyTransferActions
+            //         },
+            //         purpose: { typeOf: transaction.typeOf, id: transaction.id }
+            //     }])(repos);
+            // }))
             yield repos.reservation.checkInIfNot({ id: { $in: params.object.ids }, now });
             checkedInReservationIds = params.object.ids;
         }

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

@@ -24,21 +24,30 @@ function confirmReservation(actionAttributesList) {
         let confirmedReservations = [];
         if (actionAttributesList.length > 0) {
             yield Promise.all(actionAttributesList.map((actionAttributes) => __awaiter(this, void 0, void 0, function* () {
-                const reservation = actionAttributes.object;
+                var _a, _b;
+                const reservationPackage = actionAttributes.object;
                 const action = yield repos.action.start(actionAttributes);
                 try {
                     const reserveTransactions = yield repos.assetTransaction.search({
                         limit: 1,
                         page: 1,
                         typeOf: factory.assetTransactionType.Reserve,
-                        transactionNumber: { $eq: reservation.reservationNumber }
+                        transactionNumber: { $eq: reservationPackage.reservationNumber }
                     });
                     const reserveTransaction = reserveTransactions.shift();
                     if (reserveTransaction === undefined) {
                         throw new factory.errors.NotFound(factory.assetTransactionType.Reserve);
                     }
+                    let underName;
+                    // 予約取引に保管されたunderNameを使用する(2023-05-30~)
+                    if (typeof ((_a = reserveTransaction.object.underName) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
+                        underName = reserveTransaction.object.underName;
+                    }
+                    else if (typeof ((_b = reservationPackage.underName) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') {
+                        underName = reservationPackage.underName;
+                    }
                     // ReservationPackageに対応(2022-12-22~)
-                    if (reservation.typeOf === factory.reservationType.ReservationPackage) {
+                    if (reservationPackage.typeOf === factory.reservationType.ReservationPackage) {
                         // Pendingの予約が存在しないバージョンに対応する(2023-05-29~)
                         if (reserveTransaction.object.disablePendingReservations === true) {
                             const reservationFor = reserveTransaction.object.reservationFor;
@@ -49,7 +58,7 @@ function confirmReservation(actionAttributesList) {
                                     yield repos.reservation.confirmByIdIfNotExist({
                                         reservation: subReservation,
                                         reservationFor,
-                                        underName: reservation.underName
+                                        underName
                                     });
                                 })));
                             }
@@ -57,15 +66,15 @@ function confirmReservation(actionAttributesList) {
                         else {
                             // 予約を確定状態に変更する
                             yield repos.reservation.confirmByReservationNumber({
-                                reservationNumber: reservation.reservationNumber,
-                                previousReservationStatus: reservation.reservationStatus,
-                                underName: reservation.underName
+                                reservationNumber: reservationPackage.reservationNumber,
+                                previousReservationStatus: reservationPackage.reservationStatus,
+                                underName
                             });
                         }
                     }
                     else {
                         // 廃止(2023-01-18)
-                        throw new factory.errors.Forbidden(`${reservation.typeOf} not acceptable`);
+                        throw new factory.errors.Forbidden(`${reservationPackage.typeOf} not acceptable`);
                         // 予約を確定状態に変更する
                         // await repos.reservation.confirm<factory.reservationType.EventReservation>({
                         //     id: reservation.id,

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.313.0-alpha.16",
+    "@chevre/factory": "4.313.0-alpha.17",
     "@cinerino/sdk": "3.157.0-alpha.3",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.77"
+  "version": "21.2.0-alpha.78"
 }