@chevre/domain 21.2.0-alpha.80 → 21.2.0-alpha.82

package/example/src/chevre/searchSellers.ts

@@ -13,6 +13,16 @@ async function main() {
         hasMerchantReturnPolicy: { itemCondition: { id: { $eq: '646dc7848b3c1437d43dbfeb' } } }
     });
     console.log('sellers:', sellers);
+
+    const assetTransactionRepo = new chevre.repository.AssetTransaction(mongoose.connection);
+    const reserveTransactions = await assetTransactionRepo.search({
+        limit: 1,
+        typeOf: chevre.factory.assetTransactionType.Reserve,
+        object: {
+            reservationFor: { id: { $eq: 'xxx' } }
+        }
+    });
+    console.log('reserveTransactions:', reserveTransactions);
 }
 
 main()

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

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

package/lib/chevre/repo/assetTransaction.js

@@ -327,14 +327,14 @@ class MongoRepository {
      * 取引を確定する
      */
     confirm(params) {
-        var _a, _b, _c;
+        var _a, _b;
         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 }
             }, 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 }
+                ? { 'object.underName': params.object.underName }
                 : undefined), {
                 new: true,
                 projection: { _id: 1 }

package/lib/chevre/repo/mongoose/schemas/assetTransaction.js

@@ -135,6 +135,18 @@ schema.index({ 'object.reservationNumber': 1, startDate: -1 }, {
         'object.reservationNumber': { $exists: true }
     }
 });
+schema.index({ 'object.reservations.id': 1, startDate: -1 }, {
+    name: 'searchByObjectReservationsId',
+    partialFilterExpression: { 'object.reservations.id': { $exists: true } }
+});
+schema.index({ 'object.reservations.reservationNumber': 1, startDate: -1 }, {
+    name: 'searchByObjectReservationsReservationNumber',
+    partialFilterExpression: { 'object.reservations.reservationNumber': { $exists: true } }
+});
+schema.index({ 'object.reservations.reservationFor.id': 1, startDate: -1 }, {
+    name: 'searchByObjectReservationsReservationForId',
+    partialFilterExpression: { 'object.reservations.reservationFor.id': { $exists: true } }
+});
 schema.index({ 'object.membershipNumber': 1, startDate: -1 }, {
     name: 'searchByObjectMembershipNumber',
     partialFilterExpression: {

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

@@ -63,9 +63,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     reservationFor?: any;
     subReservation?: any;
     broker?: any;
+    underName?: any;
     price?: any;
     priceCurrency?: string | undefined;
-    underName?: any;
     issuedThrough?: any;
     reservedTicket?: any;
     additionalTicketText?: string | undefined;
@@ -91,9 +91,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     reservationFor?: any;
     subReservation?: any;
     broker?: any;
+    underName?: any;
     price?: any;
     priceCurrency?: string | undefined;
-    underName?: any;
     issuedThrough?: any;
     reservedTicket?: any;
     additionalTicketText?: string | undefined;
@@ -119,9 +119,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     reservationFor?: any;
     subReservation?: any;
     broker?: any;
+    underName?: any;
     price?: any;
     priceCurrency?: string | undefined;
-    underName?: any;
     issuedThrough?: any;
     reservedTicket?: any;
     additionalTicketText?: string | undefined;

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

@@ -75,6 +75,7 @@ export declare function createPotentialActions(params: factory.assetTransaction.
 }): {
     potentialActions: factory.assetTransaction.reserve.IPotentialActions;
     reservationPackage?: factory.action.reserve.IReservationPackageAsObject;
+    underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
 };
 export declare function createPendingReservationAction(params: {
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;

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

@@ -449,9 +449,9 @@ function createPotentialActions(params) {
     const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
     let reserveActionAttributes = [];
     let reservationPackage;
+    let underName;
     if (pendingReservations.length > 0) {
         // ReservationPackageに対応(2022-12-22~)
-        let underName;
         // purpose:Orderの指定があれば、underName,issuedByを調整(2022-05-23~)
         if (typeof ((_a = params.order) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
             const ordre2reservationUnderNameResult = ordre2reservationUnderName({ order: params.order });
@@ -468,12 +468,18 @@ function createPotentialActions(params) {
                 underName
             }));
         });
-        reservationPackage = Object.assign({ reservationFor, reservationNumber: transaction.object.reservationNumber, reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
+        reservationPackage = {
+            reservationFor,
+            reservationNumber: transaction.object.reservationNumber,
+            reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
                 ? params.transaction.object.reservationStatus
-                : factory.reservationStatusType.ReservationPending, 
+                : factory.reservationStatusType.ReservationPending,
             // 不要なので廃止(2023-01-19~)
             // subReservation: pendingReservations,
-            typeOf: factory.reservationType.ReservationPackage }, (typeof (underName === null || underName === void 0 ? void 0 : underName.typeOf) === 'string') ? { underName } : undefined);
+            typeOf: factory.reservationType.ReservationPackage
+            // 廃止(2023-05-31~)→予約取引から取得に変更
+            // ...(typeof underName?.typeOf === 'string') ? { underName } : undefined
+        };
         reserveActionAttributes = [{
                 project: transaction.project,
                 typeOf: factory.actionType.ReserveAction,
@@ -490,7 +496,8 @@ function createPotentialActions(params) {
         potentialActions: {
             reserve: reserveActionAttributes
         },
-        reservationPackage
+        reservationPackage,
+        underName
     };
 }
 exports.createPotentialActions = createPotentialActions;

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

@@ -698,7 +698,6 @@ function onReservationsCreated(params) {
  */
 function confirm(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
         let transaction;
         // 取引存在確認
         if (typeof params.id === 'string') {
@@ -717,17 +716,21 @@ function confirm(params) {
             throw new factory.errors.ArgumentNull('Transaction ID or Transaction Number');
         }
         const order = yield fixOrderAsPurpose(params, transaction)(repos);
-        const { potentialActions, reservationPackage } = (0, factory_1.createPotentialActions)(Object.assign(Object.assign({}, params), { transaction: transaction, order }));
+        const { potentialActions, underName } = (0, factory_1.createPotentialActions)(Object.assign(Object.assign({}, params), { transaction,
+            order }));
         // 取引確定
         const result = {};
         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 }, (typeof ((_a = reservationPackage === null || reservationPackage === void 0 ? void 0 : reservationPackage.underName) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-            ? { object: { underName: reservationPackage.underName } }
+                : potentialActions }, (typeof (underName === null || underName === void 0 ? void 0 : underName.typeOf) === 'string')
+            ? { object: { underName } }
             : undefined));
         if (settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING) {
             // sync対応(2023-01-13~)
-            yield (0, confirmReservation_1.confirmReservation)(potentialActions.reserve)(repos);
+            yield (0, confirmReservation_1.confirmReservation)({
+                actionAttributesList: potentialActions.reserve,
+                useOnReservationConfirmed: true
+            })(repos);
         }
     });
 }

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

@@ -9,7 +9,10 @@ import { MongoRepository as TaskRepo } from '../../repo/task';
 /**
  * 予約を確定する
  */
-export declare function confirmReservation(actionAttributesList: factory.action.reserve.IAttributes[]): (repos: {
+export declare function confirmReservation(params: {
+    actionAttributesList: factory.action.reserve.IAttributes[];
+    useOnReservationConfirmed: boolean;
+}): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTrasactionRepo;
     reservation: ReservationRepo;

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

@@ -18,106 +18,131 @@ const onReservationConfirmed_1 = require("./potentialActions/onReservationConfir
 /**
  * 予約を確定する
  */
-function confirmReservation(actionAttributesList) {
-    // tslint:disable-next-line:max-func-body-length
+function confirmReservation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        let confirmedReservations = [];
-        if (actionAttributesList.length > 0) {
-            yield Promise.all(actionAttributesList.map((actionAttributes) => __awaiter(this, void 0, void 0, function* () {
-                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: reservationPackage.reservationNumber }
+        if (params.actionAttributesList.length > 0) {
+            yield Promise.all(params.actionAttributesList.map((actionAttributes) => __awaiter(this, void 0, void 0, function* () {
+                yield reserveIfNotYet(actionAttributes)(repos);
+                if (params.useOnReservationConfirmed) {
+                    yield (0, onReservationConfirmed_1.onReservationConfirmedByAction)(actionAttributes)({ task: repos.task });
+                }
+            })));
+            if (params.useOnReservationConfirmed) {
+                let confirmedReservations = [];
+                // 確定予約通知タスクを予約番号単位で作成する(2022-12-21~)
+                const reservationNumber = params.actionAttributesList[0].object.reservationNumber;
+                if (typeof reservationNumber === 'string' && reservationNumber.length > 0) {
+                    // 最新のconfirmedReservationsを検索
+                    confirmedReservations = yield repos.reservation.search({
+                        reservationNumber: { $eq: reservationNumber },
+                        typeOf: factory.reservationType.EventReservation
                     });
-                    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 (reservationPackage.typeOf === factory.reservationType.ReservationPackage) {
-                        // Pendingの予約が存在しないバージョンに対応する(2023-05-29~)
-                        if (reserveTransaction.object.disablePendingReservations === true) {
-                            const reservationFor = reserveTransaction.object.reservationFor;
-                            const subReservations = reserveTransaction.object.subReservation;
-                            if (Array.isArray(subReservations)
-                                && typeof (reservationFor === null || reservationFor === void 0 ? void 0 : reservationFor.typeOf) === 'string') {
-                                yield Promise.all(subReservations.map((subReservation) => __awaiter(this, void 0, void 0, function* () {
-                                    yield repos.reservation.confirmByIdIfNotExist({
-                                        reservation: subReservation,
-                                        reservationFor,
-                                        underName
-                                    });
-                                })));
-                            }
-                        }
-                        else {
-                            // 予約を確定状態に変更する
-                            yield repos.reservation.confirmByReservationNumber({
-                                reservationNumber: reservationPackage.reservationNumber,
-                                previousReservationStatus: reservationPackage.reservationStatus,
-                                underName
-                            });
+                    confirmedReservations = confirmedReservations.map((r) => {
+                        // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
+                        delete r._id;
+                        return r;
+                    });
+                }
+                yield (0, onReservationConfirmed_1.onReservationConfirmed)(confirmedReservations)({ task: repos.task });
+            }
+        }
+    });
+}
+exports.confirmReservation = confirmReservation;
+// tslint:disable-next-line:max-func-body-length
+function reserveIfNotYet(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const reservationPackage = params.object;
+        // 冪等性を担保(2023-05-31~)
+        const completedActions = yield repos.action.search({
+            limit: 1,
+            page: 1,
+            typeOf: { $eq: params.typeOf },
+            object: {
+                typeOf: { $eq: params.object.typeOf }
+                // reservationNumber: { $eq: params.object.reservationNumber }
+            },
+            purpose: {
+                id: { $in: [params.purpose.id] },
+                typeOf: { $in: [params.purpose.typeOf] }
+            }
+        }, ['_id'], []);
+        if (completedActions.length === 0) {
+            const action = yield repos.action.start(params);
+            try {
+                const reserveTransactions = yield repos.assetTransaction.search({
+                    limit: 1,
+                    page: 1,
+                    typeOf: factory.assetTransactionType.Reserve,
+                    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;
+                    // 廃止(2023-05-31~)→予約取引から取得に変更
+                    // } else if (typeof reservationPackage.underName?.typeOf === 'string') {
+                    //     underName = reservationPackage.underName;
+                }
+                // ReservationPackageに対応(2022-12-22~)
+                if (reservationPackage.typeOf === factory.reservationType.ReservationPackage) {
+                    // Pendingの予約が存在しないバージョンに対応する(2023-05-29~)
+                    if (reserveTransaction.object.disablePendingReservations === true) {
+                        const reservationFor = reserveTransaction.object.reservationFor;
+                        const subReservations = reserveTransaction.object.subReservation;
+                        if (Array.isArray(subReservations)
+                            && typeof (reservationFor === null || reservationFor === void 0 ? void 0 : reservationFor.typeOf) === 'string') {
+                            yield Promise.all(subReservations.map((subReservation) => __awaiter(this, void 0, void 0, function* () {
+                                yield repos.reservation.confirmByIdIfNotExist({
+                                    reservation: subReservation,
+                                    reservationFor,
+                                    underName
+                                });
+                            })));
                         }
                     }
                     else {
-                        // 廃止(2023-01-18)
-                        throw new factory.errors.Forbidden(`${reservationPackage.typeOf} not acceptable`);
                         // 予約を確定状態に変更する
-                        // await repos.reservation.confirm<factory.reservationType.EventReservation>({
-                        //     id: reservation.id,
-                        //     previousReservationStatus: reservation.reservationStatus,
-                        //     underName: reservation.underName
-                        // });
-                        // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
-                        // delete (<any>reservation)._id;
-                        // confirmedReservations.push(reservation);
+                        yield repos.reservation.confirmByReservationNumber({
+                            reservationNumber: reservationPackage.reservationNumber,
+                            previousReservationStatus: reservationPackage.reservationStatus,
+                            underName
+                        });
                     }
                 }
-                catch (error) {
-                    // actionにエラー結果を追加
-                    try {
-                        const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
-                        yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
-                    }
-                    catch (__) {
-                        // 失敗したら仕方ない
-                    }
-                    throw error;
-                }
-                // アクション完了
-                const actionResult = {};
-                yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
-                yield (0, onReservationConfirmed_1.onReservationConfirmedByAction)(actionAttributes)({ task: repos.task });
-            })));
-            // 確定予約通知タスクを予約番号単位で作成する(2022-12-21~)
-            const reservationNumber = actionAttributesList[0].object.reservationNumber;
-            if (typeof reservationNumber === 'string' && reservationNumber.length > 0) {
-                // 最新のconfirmedReservationsを検索
-                confirmedReservations = yield repos.reservation.search({
-                    reservationNumber: { $eq: reservationNumber },
-                    typeOf: factory.reservationType.EventReservation
-                });
-                confirmedReservations = confirmedReservations.map((r) => {
+                else {
+                    // 廃止(2023-01-18)
+                    throw new factory.errors.Forbidden(`${reservationPackage.typeOf} not acceptable`);
+                    // 予約を確定状態に変更する
+                    // await repos.reservation.confirm<factory.reservationType.EventReservation>({
+                    //     id: reservation.id,
+                    //     previousReservationStatus: reservation.reservationStatus,
+                    //     underName: reservation.underName
+                    // });
                     // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
-                    delete r._id;
-                    return r;
-                });
+                    // delete (<any>reservation)._id;
+                    // confirmedReservations.push(reservation);
+                }
+            }
+            catch (error) {
+                // actionにエラー結果を追加
+                try {
+                    const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
+                    yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
+                }
+                catch (__) {
+                    // 失敗したら仕方ない
+                }
+                throw error;
             }
-            yield (0, onReservationConfirmed_1.onReservationConfirmed)(confirmedReservations)({ task: repos.task });
+            // アクション完了
+            const actionResult = {};
+            yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
         }
     });
 }
-exports.confirmReservation = confirmReservation;

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

@@ -20,7 +20,10 @@ const ReserveService = require("../reserve");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        yield ReserveService.confirmReservation(data.actionAttributes)({
+        yield ReserveService.confirmReservation({
+            actionAttributesList: data.actionAttributes,
+            useOnReservationConfirmed: true
+        })({
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             reservation: new reservation_1.MongoRepository(settings.connection),

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.313.0-alpha.19",
+    "@chevre/factory": "4.313.0-alpha.20",
     "@cinerino/sdk": "3.157.0-alpha.5",
     "@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.80"
+  "version": "21.2.0-alpha.82"
 }