npm - @chevre/domain - Versions diffs - 21.4.0-alpha.14 → 21.4.0-alpha.16 - Mend

@chevre/domain 21.4.0-alpha.14 → 21.4.0-alpha.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

package/lib/chevre/service/reserve/cancelReservation.js CHANGED Viewed

@@ -23,22 +23,15 @@ function cancelPendingReservation(actionAttributes) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const now = new Date();
-        let canceledReservations = [];
+        const canceledReservations = [];
         const { reserveTransaction } = yield cancelPengindIfNotYet(actionAttributes, now)(repos);
         if (actionAttributes.object.typeOf === factory.reservationType.ReservationPackage) {
             if (reserveTransaction.object.disablePendingReservations === true) {
                 // Pendingが存在しない場合は検索しても無駄(2023-06-05~)
             }
             else {
-                canceledReservations = yield repos.reservation.search({
-                    reservationNumber: { $eq: actionAttributes.object.reservationNumber },
-                    typeOf: factory.reservationType.EventReservation
-                });
-                canceledReservations = canceledReservations.map((r) => {
-                    // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
-                    delete r._id;
-                    return r;
-                });
+                // 完全廃止(2023-07-19~)
+                throw new factory.errors.NotImplemented('disablePendingReservations must be true');
             }
         }
         yield (0, onReservationCanceled_1.onReservationCanceled)(canceledReservations, false, {
@@ -48,7 +41,7 @@ function cancelPendingReservation(actionAttributes) {
     });
 }
 exports.cancelPendingReservation = cancelPendingReservation;
-function cancelPengindIfNotYet(params, now) {
+function cancelPengindIfNotYet(params, __) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const actionAttributes = params;
@@ -83,7 +76,7 @@ function cancelPengindIfNotYet(params, now) {
             // アクション開始
             const action = yield repos.action.start(actionAttributes);
             const actionObject = actionAttributes.object;
-            let cancelResult;
+            // let cancelResult: ICancelResult | undefined;
             try {
                 if (reserveTransaction !== undefined) {
                     const reservationFor = reserveTransaction.object.reservationFor;
@@ -126,12 +119,8 @@ function cancelPengindIfNotYet(params, now) {
                             // disablePendingReservationsの場合は処理不要(2023-06-05~)
                         }
                         else {
-                            // 予約番号単位でキャンセル状態に変更する
-                            cancelResult = yield repos.reservation.cancelByReservationNumber({
-                                reservationNumber: actionObject.reservationNumber,
-                                previousReservationStatus: actionObject.reservationStatus,
-                                modifiedTime: now
-                            });
+                            // 完全廃止(2023-07-19~)
+                            throw new factory.errors.NotImplemented('disablePendingReservations must be true');
                         }
                     }
                     else {
@@ -152,17 +141,15 @@ function cancelPengindIfNotYet(params, now) {
                 throw error;
             }
             // アクション完了
-            const actionResult = Object.assign({}, (cancelResult !== undefined) ? {
-                cancelResult: {
-                    // n: cancelResult.n,
-                    // nModified: cancelResult.nModified,
-                    // ok: cancelResult.ok,
-                    matchedCount: cancelResult.matchedCount,
-                    modifiedCount: cancelResult.modifiedCount
-                }
-            } : undefined
+            const actionResult = {
+            // ...(cancelResult !== undefined) ? {
+            //     cancelResult: {
+            //         matchedCount: cancelResult.matchedCount,
+            //         modifiedCount: cancelResult.modifiedCount
+            //     }
+            // } : undefined
             // canceledReservationId: canceledReservation?.id
-            );
+            };
             yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
         }
         return { reserveTransaction };

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

@@ -51,7 +51,7 @@ exports.confirmReservation = confirmReservation;
 function reserveIfNotYet(params, options) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const reservationPackage = params.object;
         // 冪等性を担保(2023-05-31~)
         debug('searching completed reserveAction... byTask:', options === null || options === void 0 ? void 0 : options.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
@@ -97,50 +97,32 @@ function reserveIfNotYet(params, options) {
                     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') {
+                        const issuedThrough = reserveTransaction.object.issuedThrough;
+                        if (Array.isArray(subReservations)
+                            && typeof (reservationFor === null || reservationFor === void 0 ? void 0 : reservationFor.typeOf) === 'string'
+                            && typeof (issuedThrough === null || issuedThrough === void 0 ? void 0 : issuedThrough.typeOf) === 'string') {
                             // confirmManyに変更(2023-06-13~)
                             const confirmManyIfNotExistResult = yield repos.reservation.confirmManyIfNotExist({
+                                provider: (typeof ((_b = reserveTransaction.object.provider) === null || _b === void 0 ? void 0 : _b.id) === 'string')
+                                    ? reserveTransaction.object.provider
+                                    : { id: reserveTransaction.agent.id, typeOf: factory.organizationType.Corporation },
                                 subReservation: subReservations,
+                                issuedThrough,
                                 reservationFor,
                                 underName,
-                                broker: reserveTransaction.object.broker,
-                                issuedThrough: reserveTransaction.object.issuedThrough
+                                broker: reserveTransaction.object.broker
                             });
                             debug('confirmManyIfNotExistResult:', confirmManyIfNotExistResult, 'reservationNumber:', reservationPackage.reservationNumber);
-                            // await Promise.all(subReservations.map(async (subReservation) => {
-                            //     await repos.reservation.confirmByIdIfNotExist({
-                            //         reservation: subReservation,
-                            //         reservationFor,
-                            //         underName,
-                            //         broker: reserveTransaction.object.broker,
-                            //         issuedThrough: reserveTransaction.object.issuedThrough
-                            //     });
-                            // }));
                         }
                     }
                     else {
-                        // 予約を確定状態に変更する
-                        yield repos.reservation.confirmByReservationNumber({
-                            reservationNumber: reservationPackage.reservationNumber,
-                            previousReservationStatus: reservationPackage.reservationStatus,
-                            underName,
-                            broker: reserveTransaction.object.broker,
-                            issuedThrough: reserveTransaction.object.issuedThrough
-                        });
+                        // 完全廃止(2023-07-19~)
+                        throw new factory.errors.NotImplemented('disablePendingReservations must be true');
                     }
                 }
                 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);
                 }
             }
             catch (error) {

package/lib/chevre/service/reserve/verifyToken4reservation.d.ts CHANGED Viewed

@@ -7,6 +7,9 @@ export declare function verifyToken4reservation(params: {
     project: {
         id: string;
     };
+    seller?: {
+        id?: string;
+    };
     agent: factory.action.check.token.IAgent;
     reservationId: string;
     token: string;

package/lib/chevre/service/reserve/verifyToken4reservation.js CHANGED Viewed

@@ -27,7 +27,8 @@ function verifyToken4reservation(params) {
                 // reservationIdを含む注文の存在を確認するだけでよい(2023-01-31~)
                 const order = yield repos.order.findByOrderNumberAndReservationId({
                     orderNumber: payload.orderNumber,
-                    reservationId: params.reservationId
+                    reservationId: params.reservationId,
+                    seller: params.seller
                 });
                 // ステータス検証
                 switch (order.orderStatus) {

package/package.json CHANGED Viewed

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.315.0-alpha.3",
-    "@cinerino/sdk": "3.160.0-alpha.3",
+    "@chevre/factory": "4.316.0-alpha.0",
+    "@cinerino/sdk": "3.160.0-alpha.5",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.4.0-alpha.14"
+  "version": "21.4.0-alpha.16"
 }