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

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

@@ -729,7 +729,8 @@ function confirm(params) {
             // sync対応(2023-01-13~)
             yield (0, confirmReservation_1.confirmReservation)({
                 actionAttributesList: potentialActions.reserve,
-                useOnReservationConfirmed: true
+                useOnReservationConfirmed: true,
+                byTask: true
             })(repos);
         }
     });

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

@@ -10,13 +10,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkInReservation = void 0;
+const createDebug = require("debug");
 const factory = require("../../factory");
 const confirmReservation_1 = require("./confirmReservation");
 const onReservationCheckedIn_1 = require("./potentialActions/onReservationCheckedIn");
+const debug = createDebug('chevre-domain:service:reserve:checkInReservation');
 function checkInReservation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
+        debug('reserveIfNotYet?', params.reserveIfNotYet, 'ids:', params.object.ids, 'reservationNumbers:', params.object.reservationNumbers);
         if (params.reserveIfNotYet === true) {
             yield reserveIfNotYet(params)(repos);
         }
@@ -71,6 +74,7 @@ function reserveIfNotYet(params) {
                 },
                 statuses: [factory.transactionStatusType.Confirmed]
             }, ['_id', 'transactionNumber', 'object', 'project', 'typeOf']);
+            debug(reserveTransactions.length, 'reserveTransactions found in reserveIfNotYet. ids:', params.object.ids);
         }
         if (Array.isArray(params.object.reservationNumbers) && params.object.reservationNumbers.length > 0) {
             reserveTransactions = yield repos.assetTransaction.search({
@@ -80,6 +84,7 @@ function reserveIfNotYet(params) {
                 },
                 statuses: [factory.transactionStatusType.Confirmed]
             }, ['_id', 'transactionNumber', 'object', 'project', 'typeOf']);
+            debug(reserveTransactions.length, 'reserveTransactions found in reserveIfNotYet. reservationNumbers:', params.object.reservationNumbers);
         }
         yield Promise.all(reserveTransactions.map((reserveTransaction) => __awaiter(this, void 0, void 0, function* () {
             var _a;
@@ -99,8 +104,10 @@ function reserveIfNotYet(params) {
                             agent: reserveTransaction.project,
                             purpose: { typeOf: reserveTransaction.typeOf, id: reserveTransaction.id }
                         }],
-                    useOnReservationConfirmed: false // ここでは確定予約の存在を担保すればよいだけ
+                    useOnReservationConfirmed: false,
+                    byTask: false
                 })(repos);
+                debug('confirmReservation processed in reserveIfNotYet. reservationNumber:', reserveTransaction.object.reservationNumber);
             }
         })));
     });

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

@@ -1,6 +1,3 @@
-/**
- * 予約サービス
- */
 import * as factory from '../../factory';
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { MongoRepository as AssetTrasactionRepo } from '../../repo/assetTransaction';
@@ -12,6 +9,7 @@ import { MongoRepository as TaskRepo } from '../../repo/task';
 export declare function confirmReservation(params: {
     actionAttributesList: factory.action.reserve.IAttributes[];
     useOnReservationConfirmed: boolean;
+    byTask: boolean;
 }): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTrasactionRepo;

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

@@ -10,11 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmReservation = void 0;
-/**
- * 予約サービス
- */
+const createDebug = require("debug");
 const factory = require("../../factory");
 const onReservationConfirmed_1 = require("./potentialActions/onReservationConfirmed");
+const debug = createDebug('chevre-domain:service:reserve:confirmReservation');
 /**
  * 予約を確定する
  */
@@ -22,7 +21,7 @@ function confirmReservation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         if (params.actionAttributesList.length > 0) {
             yield Promise.all(params.actionAttributesList.map((actionAttributes) => __awaiter(this, void 0, void 0, function* () {
-                yield reserveIfNotYet(actionAttributes)(repos);
+                yield reserveIfNotYet(actionAttributes, { byTask: params.byTask })(repos);
                 if (params.useOnReservationConfirmed) {
                     yield (0, onReservationConfirmed_1.onReservationConfirmedByAction)(actionAttributes)({ task: repos.task });
                 }
@@ -49,12 +48,13 @@ function confirmReservation(params) {
     });
 }
 exports.confirmReservation = confirmReservation;
-function reserveIfNotYet(params) {
+function reserveIfNotYet(params, options) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const reservationPackage = params.object;
         // 冪等性を担保(2023-05-31~)
+        debug('searching completed reserveAction... byTask:', options === null || options === void 0 ? void 0 : options.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
         const completedActions = yield repos.action.search({
             limit: 1,
             page: 1,
@@ -69,6 +69,7 @@ function reserveIfNotYet(params) {
                 typeOf: { $in: [params.purpose.typeOf] }
             }
         }, ['_id'], []);
+        debug(completedActions.length, 'completed reserveAction found. byTask:', options === null || options === void 0 ? void 0 : options.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
         if (completedActions.length === 0) {
             const action = yield repos.action.start(params);
             try {

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

@@ -1,5 +1,6 @@
 import * as factory from '../../factory';
 import { MongoRepository as ActionRepo } from '../../repo/action';
+import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import { MongoRepository as OrderRepo } from '../../repo/order';
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
 import { MongoRepository as TaskRepo } from '../../repo/task';
@@ -25,8 +26,10 @@ export declare function useReservation(params: {
         identifier?: string;
     };
     verifyToken: boolean;
+    reserveIfNotYet: boolean;
 }): (repos: {
     action: ActionRepo;
+    assetTransaction: AssetTransactionRepo;
     order: OrderRepo;
     reservation: ReservationRepo;
     task: TaskRepo;

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

@@ -10,9 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useReservation = void 0;
+const createDebug = require("debug");
 const factory = require("../../factory");
+const confirmReservation_1 = require("./confirmReservation");
 const onReservationUsed_1 = require("./potentialActions/onReservationUsed");
 const verifyToken4reservation_1 = require("./verifyToken4reservation");
+const debug = createDebug('chevre-domain:service:reserve:useReservation');
 /**
  * 予約使用
  */
@@ -34,6 +37,11 @@ function useReservation(params) {
                 })({ order: repos.order });
             }
         }
+        // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
+        debug('reserveIfNotYet?', params.reserveIfNotYet, 'id:', params.object.id);
+        if (params.reserveIfNotYet === true) {
+            yield reserveIfNotYet({ object: params.object })(repos);
+        }
         // 予約検索
         // 取得属性最適化(2023-01-30~)
         const reservation = yield repos.reservation.findById({
@@ -88,3 +96,42 @@ function useReservation(params) {
     });
 }
 exports.useReservation = useReservation;
+function reserveIfNotYet(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        let reserveTransactions = [];
+        if (typeof params.object.id === 'string' && params.object.id.length > 0) {
+            reserveTransactions = yield repos.assetTransaction.search({
+                typeOf: factory.assetTransactionType.Reserve,
+                object: {
+                    reservations: { id: { $in: [params.object.id] } }
+                },
+                statuses: [factory.transactionStatusType.Confirmed]
+            }, ['_id', 'transactionNumber', 'object', 'project', 'typeOf']);
+            debug(reserveTransactions.length, 'reserveTransactions found in reserveIfNotYet. id:', params.object.id);
+        }
+        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,
+                    byTask: false
+                })(repos);
+                debug('confirmReservation processed in reserveIfNotYet. reservationNumber:', reserveTransaction.object.reservationNumber);
+            }
+        })));
+    });
+}

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

@@ -97,7 +97,7 @@ function onAuthorizationCreated(params) {
                 reservationNumbers: reservationNumbers,
                 reservationFor: { ids: reservationForIds }
             },
-            reserveIfNotYet: false
+            reserveIfNotYet: params.reserveIfNotYet
         })({
             action: repos.action,
             assetTransaction: repos.assetTransaction,

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

@@ -22,7 +22,8 @@ function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
         yield ReserveService.confirmReservation({
             actionAttributesList: data.actionAttributes,
-            useOnReservationConfirmed: true
+            useOnReservationConfirmed: true,
+            byTask: true
         })({
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),

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

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const action_1 = require("../../repo/action");
+const assetTransaction_1 = require("../../repo/assetTransaction");
 const order_1 = require("../../repo/order");
 const reservation_1 = require("../../repo/reservation");
 const task_1 = require("../../repo/task");
@@ -23,8 +24,9 @@ function call(data) {
         var _a, _b;
         yield (0, reserve_1.useReservation)(Object.assign(Object.assign({ project: data.project, agent: data.agent, object: data.object, 
             // タスク作成前に検証済なので検証不要
-            verifyToken: false }, (typeof ((_a = data.instrument) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { instrument: data.instrument } : undefined), (typeof ((_b = data.location) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { location: data.location } : undefined))({
+            verifyToken: false, reserveIfNotYet: data.reserveIfNotYet }, (typeof ((_a = data.instrument) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { instrument: data.instrument } : undefined), (typeof ((_b = data.location) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { location: data.location } : undefined))({
             action: new action_1.MongoRepository(settings.connection),
+            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
             reservation: new reservation_1.MongoRepository(settings.connection),
             task: new task_1.MongoRepository(settings.connection)

package/package.json

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