@chevre/domain 21.2.0-alpha.84 → 21.2.0-alpha.86

package/lib/chevre/repo/assetTransaction.js

@@ -23,7 +23,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16;
         const andConditions = [
             {
                 typeOf: params.typeOf
@@ -184,7 +184,16 @@ class MongoRepository {
                         }
                     });
                 }
-                const objectReservationNumberEq = (_0 = (_z = params.object) === null || _z === void 0 ? void 0 : _z.reservationNumber) === null || _0 === void 0 ? void 0 : _0.$eq;
+                const objectReservationNumberIn = (_0 = (_z = params.object) === null || _z === void 0 ? void 0 : _z.reservationNumber) === null || _0 === void 0 ? void 0 : _0.$in;
+                if (Array.isArray(objectReservationNumberIn)) {
+                    andConditions.push({
+                        'object.reservationNumber': {
+                            $exists: true,
+                            $in: objectReservationNumberIn
+                        }
+                    });
+                }
+                const objectReservationNumberEq = (_2 = (_1 = params.object) === null || _1 === void 0 ? void 0 : _1.reservationNumber) === null || _2 === void 0 ? void 0 : _2.$eq;
                 if (typeof objectReservationNumberEq === 'string') {
                     andConditions.push({
                         'object.reservationNumber': {
@@ -193,7 +202,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const objectSubReservationIdIn = (_3 = (_2 = (_1 = params.object) === null || _1 === void 0 ? void 0 : _1.reservations) === null || _2 === void 0 ? void 0 : _2.id) === null || _3 === void 0 ? void 0 : _3.$in;
+                const objectSubReservationIdIn = (_5 = (_4 = (_3 = params.object) === null || _3 === void 0 ? void 0 : _3.reservations) === null || _4 === void 0 ? void 0 : _4.id) === null || _5 === void 0 ? void 0 : _5.$in;
                 if (Array.isArray(objectSubReservationIdIn)) {
                     andConditions.push({
                         'object.subReservation.id': {
@@ -228,7 +237,7 @@ class MongoRepository {
                         }
                     }
                 }
-                const objectUnderNameIdEq = (_6 = (_5 = (_4 = params.object) === null || _4 === void 0 ? void 0 : _4.underName) === null || _5 === void 0 ? void 0 : _5.id) === null || _6 === void 0 ? void 0 : _6.$eq;
+                const objectUnderNameIdEq = (_8 = (_7 = (_6 = params.object) === null || _6 === void 0 ? void 0 : _6.underName) === null || _7 === void 0 ? void 0 : _7.id) === null || _8 === void 0 ? void 0 : _8.$eq;
                 if (typeof objectUnderNameIdEq === 'string') {
                     andConditions.push({
                         'object.underName.id': {
@@ -239,7 +248,7 @@ class MongoRepository {
                 }
                 break;
             case factory.assetTransactionType.RegisterService:
-                const objectItemOfferedServiceOutputIdentifierEq = (_10 = (_9 = (_8 = (_7 = params.object) === null || _7 === void 0 ? void 0 : _7.itemOffered) === null || _8 === void 0 ? void 0 : _8.serviceOutput) === null || _9 === void 0 ? void 0 : _9.identifier) === null || _10 === void 0 ? void 0 : _10.$eq;
+                const objectItemOfferedServiceOutputIdentifierEq = (_12 = (_11 = (_10 = (_9 = params.object) === null || _9 === void 0 ? void 0 : _9.itemOffered) === null || _10 === void 0 ? void 0 : _10.serviceOutput) === null || _11 === void 0 ? void 0 : _11.identifier) === null || _12 === void 0 ? void 0 : _12.$eq;
                 if (typeof objectItemOfferedServiceOutputIdentifierEq === 'string') {
                     andConditions.push({
                         'object.itemOffered.serviceOutput.identifier': {
@@ -248,7 +257,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const objectItemOfferedServiceOutputIdentifierIn = (_14 = (_13 = (_12 = (_11 = params.object) === null || _11 === void 0 ? void 0 : _11.itemOffered) === null || _12 === void 0 ? void 0 : _12.serviceOutput) === null || _13 === void 0 ? void 0 : _13.identifier) === null || _14 === void 0 ? void 0 : _14.$in;
+                const objectItemOfferedServiceOutputIdentifierIn = (_16 = (_15 = (_14 = (_13 = params.object) === null || _13 === void 0 ? void 0 : _13.itemOffered) === null || _14 === void 0 ? void 0 : _14.serviceOutput) === null || _15 === void 0 ? void 0 : _15.identifier) === null || _16 === void 0 ? void 0 : _16.$in;
                 if (Array.isArray(objectItemOfferedServiceOutputIdentifierIn)) {
                     andConditions.push({
                         'object.itemOffered.serviceOutput.identifier': {

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

@@ -1,6 +1,8 @@
+import { MongoRepository as ActionRepo } from '../../repo/action';
+import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
 import { MongoRepository as TaskRepo } from '../../repo/task';
-export declare function checkInRerservation(params: {
+interface ICheckInReservationParams {
     project: {
         id: string;
     };
@@ -20,7 +22,13 @@ export declare function checkInRerservation(params: {
             ids?: string[];
         };
     };
+}
+export declare function checkInReservation(params: ICheckInReservationParams & {
+    reserveIfNotYet: boolean;
 }): (repos: {
+    action: ActionRepo;
+    assetTransaction: AssetTransactionRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
 }) => Promise<void>;
+export {};

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

@@ -1,5 +1,4 @@
 "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,41 +9,40 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkInRerservation = void 0;
-// import { confirmReservation } from './confirmReservation';
+exports.checkInReservation = void 0;
+const factory = require("../../factory");
+const confirmReservation_1 = require("./confirmReservation");
 const onReservationCheckedIn_1 = require("./potentialActions/onReservationCheckedIn");
-function checkInRerservation(params) {
+function checkInReservation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
+        // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
+        if (params.reserveIfNotYet === true) {
+            yield reserveIfNotYet(params)(repos);
+        }
         // 発券処理(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);
-            // }))
+            const existingReservationCount = yield repos.reservation.count({
+                id: { $in: params.object.ids },
+                typeOf: factory.reservationType.EventReservation
+            });
+            if (existingReservationCount !== params.object.ids.length) {
+                throw new factory.errors.NotFound(factory.reservationType.EventReservation, `Some reservations dot not exist. ${params.object.ids.join(',')}`);
+            }
             yield repos.reservation.checkInIfNot({ id: { $in: params.object.ids }, now });
             checkedInReservationIds = params.object.ids;
         }
         if (Array.isArray(params.object.reservationNumbers) && params.object.reservationNumbers.length > 0) {
+            for (const reservationNumber of params.object.reservationNumbers) {
+                const existingReservationCount = yield repos.reservation.count({
+                    reservationNumber: { $eq: reservationNumber },
+                    typeOf: factory.reservationType.EventReservation
+                });
+                if (existingReservationCount === 0) {
+                    throw new factory.errors.NotFound(factory.reservationType.EventReservation, `Some reservations dot not exist. ${params.object.reservationNumbers.join(',')}`);
+                }
+            }
             yield repos.reservation.checkInIfNot({ reservationNumber: { $in: params.object.reservationNumbers }, now });
             // 予約番号リストを予約IDリストに変換
             checkedInReservationIds = yield repos.reservation.searchIdsByReservationNumber({
@@ -61,4 +59,49 @@ function checkInRerservation(params) {
         })({ task: repos.task });
     });
 }
-exports.checkInRerservation = checkInRerservation;
+exports.checkInReservation = checkInReservation;
+function reserveIfNotYet(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        let reserveTransactions = [];
+        if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
+            reserveTransactions = yield repos.assetTransaction.search({
+                typeOf: factory.assetTransactionType.Reserve,
+                object: {
+                    reservations: { id: { $in: params.object.ids } }
+                },
+                statuses: [factory.transactionStatusType.Confirmed]
+            }, ['_id', 'transactionNumber', 'object', 'project', 'typeOf']);
+        }
+        if (Array.isArray(params.object.reservationNumbers) && params.object.reservationNumbers.length > 0) {
+            reserveTransactions = yield repos.assetTransaction.search({
+                typeOf: factory.assetTransactionType.Reserve,
+                object: {
+                    reservationNumber: { $in: params.object.reservationNumbers }
+                },
+                statuses: [factory.transactionStatusType.Confirmed]
+            }, ['_id', 'transactionNumber', 'object', 'project', 'typeOf']);
+        }
+        yield Promise.all(reserveTransactions.map((reserveTransaction) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            if (typeof ((_a = reserveTransaction.object.reservationFor) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
+                yield (0, confirmReservation_1.confirmReservation)({
+                    actionAttributesList: [{
+                            project: reserveTransaction.project,
+                            typeOf: factory.actionType.ReserveAction,
+                            object: {
+                                typeOf: reserveTransaction.object.typeOf,
+                                reservationNumber: reserveTransaction.object.reservationNumber,
+                                reservationStatus: (typeof reserveTransaction.object.reservationStatus === 'string')
+                                    ? reserveTransaction.object.reservationStatus
+                                    : factory.reservationStatusType.ReservationPending,
+                                reservationFor: reserveTransaction.object.reservationFor
+                            },
+                            agent: reserveTransaction.project,
+                            purpose: { typeOf: reserveTransaction.typeOf, id: reserveTransaction.id }
+                        }],
+                    useOnReservationConfirmed: false // ここでは確定予約の存在を担保すればよいだけ
+                })(repos);
+            }
+        })));
+    });
+}

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

@@ -3,8 +3,8 @@
  */
 import { maskUnderName } from './reserve/factory';
 import { cancelPendingReservation, cancelReservation } from './reserve/cancelReservation';
-import { checkInRerservation } from './reserve/checkInReservation';
+import { checkInReservation } from './reserve/checkInReservation';
 import { confirmReservation } from './reserve/confirmReservation';
 import { useReservation } from './reserve/useReservation';
 import { verifyToken4reservation } from './reserve/verifyToken4reservation';
-export { maskUnderName, cancelPendingReservation, cancelReservation, checkInRerservation, confirmReservation, useReservation, verifyToken4reservation };
+export { maskUnderName, cancelPendingReservation, cancelReservation, checkInReservation, confirmReservation, useReservation, verifyToken4reservation };

package/lib/chevre/service/reserve.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyToken4reservation = exports.useReservation = exports.confirmReservation = exports.checkInRerservation = exports.cancelReservation = exports.cancelPendingReservation = exports.maskUnderName = void 0;
+exports.verifyToken4reservation = exports.useReservation = exports.confirmReservation = exports.checkInReservation = exports.cancelReservation = exports.cancelPendingReservation = exports.maskUnderName = void 0;
 /**
  * 予約サービス
  */
@@ -10,7 +10,7 @@ const cancelReservation_1 = require("./reserve/cancelReservation");
 Object.defineProperty(exports, "cancelPendingReservation", { enumerable: true, get: function () { return cancelReservation_1.cancelPendingReservation; } });
 Object.defineProperty(exports, "cancelReservation", { enumerable: true, get: function () { return cancelReservation_1.cancelReservation; } });
 const checkInReservation_1 = require("./reserve/checkInReservation");
-Object.defineProperty(exports, "checkInRerservation", { enumerable: true, get: function () { return checkInReservation_1.checkInRerservation; } });
+Object.defineProperty(exports, "checkInReservation", { enumerable: true, get: function () { return checkInReservation_1.checkInReservation; } });
 const confirmReservation_1 = require("./reserve/confirmReservation");
 Object.defineProperty(exports, "confirmReservation", { enumerable: true, get: function () { return confirmReservation_1.confirmReservation; } });
 const useReservation_1 = require("./reserve/useReservation");

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

@@ -11,6 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const factory = require("../../factory");
+const action_1 = require("../../repo/action");
+const assetTransaction_1 = require("../../repo/assetTransaction");
 const code_1 = require("../../repo/code");
 const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
@@ -23,6 +25,8 @@ const reserve_1 = require("../reserve");
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
         yield onAuthorizationCreated(data)({
+            action: new action_1.MongoRepository(settings.connection),
+            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             code: new code_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
             ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),
@@ -86,14 +90,17 @@ function onAuthorizationCreated(params) {
             default:
             // no op
         }
-        yield (0, reserve_1.checkInRerservation)({
+        yield (0, reserve_1.checkInReservation)({
             project: { id: params.project.id },
             object: {
                 ids: reservationIds,
                 reservationNumbers: reservationNumbers,
                 reservationFor: { ids: reservationForIds }
-            }
+            },
+            reserveIfNotYet: false
         })({
+            action: repos.action,
+            assetTransaction: repos.assetTransaction,
             reservation: repos.reservation,
             task: repos.task
         });

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.313.0-alpha.20",
+    "@chevre/factory": "4.313.0-alpha.21",
     "@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.84"
+  "version": "21.2.0-alpha.86"
 }