@chevre/domain 22.9.0-alpha.23 → 22.9.0-alpha.24

package/lib/chevre/repo/action.js

@@ -773,7 +773,9 @@ class ActionRepo {
                     { 'object.orderNumber': { $exists: true, $eq: params.orderNumber } },
                     { 'purpose.orderNumber': { $exists: true, $eq: params.orderNumber } },
                     // consider inform returnAction(2025-01-22~)
-                    { 'about.orderNumber': { $exists: true, $eq: params.orderNumber } }
+                    { 'about.orderNumber': { $exists: true, $eq: params.orderNumber } },
+                    // consider reserveAction,cancelReservationAction(2025-02-17~)
+                    { 'instrument.orderNumber': { $exists: true, $eq: params.orderNumber } }
                 ]
             };
             const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(AVAILABLE_PROJECT_FIELDS.map((key) => ([key, 1]))));

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

@@ -400,6 +400,15 @@ const indexes = [
             }
         }
     ],
+    [
+        { 'instrument.orderNumber': 1, startDate: -1 },
+        {
+            name: 'instrumentOrderNumber',
+            partialFilterExpression: {
+                'instrument.orderNumber': { $exists: true }
+            }
+        }
+    ],
     [
         { 'object.transactionNumber': 1, startDate: -1 },
         {

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

@@ -4,7 +4,7 @@ import * as factory from '../../../factory';
  */
 export declare function createStartParams(params: {
     paramsWithoutDetail: factory.assetTransaction.cancelReservation.IStartParamsWithoutDetail & {
-        instrument: factory.assetTransaction.cancelReservation.IInstrument[];
+        instrument: factory.action.cancel.reservation.IInstrument[];
     };
     project: factory.assetTransaction.IProject;
     transactionNumber: string;

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

@@ -76,70 +76,60 @@ function createPotentialActions(params) {
             reservationStatus: factory.reservationStatusType.ReservationConfirmed,
             typeOf: factory.reservationType.ReservationPackage
         };
-        cancelReservationActionAttributes = [{
-                project: transaction.project,
-                typeOf: factory.actionType.CancelAction,
-                object: cancelObject,
-                agent: transaction.project,
-                purpose: {
+        cancelReservationActionAttributes = [Object.assign({ project: transaction.project, typeOf: factory.actionType.CancelAction, object: cancelObject, agent: transaction.project, purpose: {
                     typeOf: transaction.typeOf,
                     id: transaction.id
-                }
-            }];
+                } }, (Array.isArray(transaction.instrument)) ? { instrument: transaction.instrument } : undefined // add(2025-02-17~)
+            )];
     }
     else if (Array.isArray(transaction.object.reservations)) {
         // 予約取消アクション属性作成
-        cancelReservationActionAttributes = transaction.object.reservations.map((reservation) => {
-            var _a, _b;
-            // 最適化(2022-06-06~)
-            let cancelObject;
-            if (reservation.typeOf === factory.reservationType.BusReservation) {
-                cancelObject = {
-                    typeOf: reservation.typeOf,
-                    id: reservation.id,
-                    issuedThrough: {
-                        typeOf: (_a = reservation.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf
-                    },
-                    reservationFor: {
-                        typeOf: reservation.reservationFor.typeOf,
-                        id: String(reservation.reservationFor.id)
-                    },
-                    reservationNumber: reservation.reservationNumber,
-                    // ReservationConfirmed->ReservationCancelledのみ処理されるように保証する
-                    reservationStatus: factory.reservationStatusType.ReservationConfirmed
-                };
-            }
-            else if (reservation.typeOf === factory.reservationType.EventReservation) {
-                cancelObject = {
-                    typeOf: reservation.typeOf,
-                    id: reservation.id,
-                    issuedThrough: {
-                        typeOf: (_b = reservation.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf
-                    },
-                    reservationFor: {
-                        typeOf: reservation.reservationFor.typeOf,
-                        id: String(reservation.reservationFor.id)
-                    },
-                    reservationNumber: reservation.reservationNumber,
-                    // ReservationConfirmed->ReservationCancelledのみ処理されるように保証する
-                    reservationStatus: factory.reservationStatusType.ReservationConfirmed
-                };
-            }
-            else {
-                throw new factory.errors.NotImplemented(`reservation.typeOf ${reservation.typeOf} not imeplemented`);
-            }
-            return {
-                project: transaction.project,
-                typeOf: factory.actionType.CancelAction,
-                object: cancelObject,
-                agent: transaction.project,
-                potentialActions: {},
-                purpose: {
-                    typeOf: transaction.typeOf,
-                    id: transaction.id
+        cancelReservationActionAttributes =
+            transaction.object.reservations.map((reservation) => {
+                var _a, _b;
+                // 最適化(2022-06-06~)
+                let cancelObject;
+                if (reservation.typeOf === factory.reservationType.BusReservation) {
+                    cancelObject = {
+                        typeOf: reservation.typeOf,
+                        id: reservation.id,
+                        issuedThrough: {
+                            typeOf: (_a = reservation.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf
+                        },
+                        reservationFor: {
+                            typeOf: reservation.reservationFor.typeOf,
+                            id: String(reservation.reservationFor.id)
+                        },
+                        reservationNumber: reservation.reservationNumber,
+                        // ReservationConfirmed->ReservationCancelledのみ処理されるように保証する
+                        reservationStatus: factory.reservationStatusType.ReservationConfirmed
+                    };
                 }
-            };
-        });
+                else if (reservation.typeOf === factory.reservationType.EventReservation) {
+                    cancelObject = {
+                        typeOf: reservation.typeOf,
+                        id: reservation.id,
+                        issuedThrough: {
+                            typeOf: (_b = reservation.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf
+                        },
+                        reservationFor: {
+                            typeOf: reservation.reservationFor.typeOf,
+                            id: String(reservation.reservationFor.id)
+                        },
+                        reservationNumber: reservation.reservationNumber,
+                        // ReservationConfirmed->ReservationCancelledのみ処理されるように保証する
+                        reservationStatus: factory.reservationStatusType.ReservationConfirmed
+                    };
+                }
+                else {
+                    throw new factory.errors.NotImplemented(`reservation.typeOf ${reservation.typeOf} not imeplemented`);
+                }
+                return Object.assign({ project: transaction.project, typeOf: factory.actionType.CancelAction, object: cancelObject, agent: transaction.project, potentialActions: {}, purpose: {
+                        typeOf: transaction.typeOf,
+                        id: transaction.id
+                    } }, (Array.isArray(transaction.instrument)) ? { instrument: transaction.instrument } : undefined // add(2025-02-17~)
+                );
+            });
     }
     return {
         cancelReservation: cancelReservationActionAttributes

package/lib/chevre/service/assetTransaction/cancelReservation/start.d.ts

@@ -11,7 +11,7 @@ export type IStartParams = factory.assetTransaction.cancelReservation.IStartPara
     seller: {
         id?: string;
     };
-    instrument: factory.assetTransaction.cancelReservation.IInstrument[];
+    instrument: factory.action.cancel.reservation.IInstrument[];
 };
 export declare function validateStartParams(params: IStartParams): (repos: {
     reservation: ReservationRepo;

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

@@ -18,8 +18,3 @@ export declare function confirmReservation(params: {
     setting: SettingRepo;
     task: TaskRepo;
 }) => Promise<void>;
-type IReserveActionAttributes = Pick<factory.action.reserve.IAttributes, 'agent' | 'object' | 'potentialActions' | 'project' | 'purpose' | 'typeOf'>;
-export declare function reserveTransaction2action(params: {
-    transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
-}): IReserveActionAttributes;
-export {};

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

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmReservation = confirmReservation;
-exports.reserveTransaction2action = reserveTransaction2action;
 const createDebug = require("debug");
 const factory = require("../../factory");
 const factory_1 = require("./factory");
@@ -91,16 +90,10 @@ function reserveTransaction2action(params) {
             : factory.reservationStatusType.ReservationPending,
         typeOf: factory.reservationType.ReservationPackage
     };
-    return {
-        project: transaction.project,
-        typeOf: factory.actionType.ReserveAction,
-        object: reservationPackage,
-        agent: transaction.project,
-        potentialActions: {
+    return Object.assign({ project: transaction.project, typeOf: factory.actionType.ReserveAction, object: reservationPackage, agent: transaction.project, potentialActions: {
             moneyTransfer: moneyTransferActions
-        },
-        purpose: { typeOf: transaction.typeOf, id: transaction.id }
-    };
+        }, purpose: { typeOf: transaction.typeOf, id: transaction.id } }, (Array.isArray(transaction.instrument)) ? { instrument: transaction.instrument } : undefined // add(2025-02-17~)
+    );
 }
 function reserveIfNotYet(
 // params: factory.action.reserve.IAttributes,

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

@@ -110,6 +110,10 @@ function returnReserve(params) {
 }
 function processCancelReservation4chevre(params, returnAction) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const orderAsInstrument = {
+            orderNumber: returnAction.purpose.orderNumber,
+            typeOf: factory.order.OrderType.Order
+        };
         // まず取引番号発行
         const { transactionNumber } = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
         yield CancelReservationTransactionService.startAndConfirm({
@@ -130,7 +134,7 @@ function processCancelReservation4chevre(params, returnAction) {
                 .add(1, 'minutes')
                 .toDate(),
             seller: {}, // 販売者条件必要なし
-            instrument: [returnAction] // add instrument(2025-02-17~)
+            instrument: [returnAction, orderAsInstrument] // add instrument(2025-02-17~)
         })(repos);
     });
 }

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.393.0-alpha.18",
+    "@chevre/factory": "4.393.0-alpha.20",
     "@cinerino/sdk": "10.21.0-alpha.15",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -107,10 +107,10 @@
     "test": "npm run check && npm run coverage",
     "tslint": "tslint --project tsconfig.json -c tslint.json --exclude \"**/*.spec.ts\" \"src/**/*.ts\"",
     "eslint": "eslint src/**/*.ts",
-    "preversion": "npm run clean && npm run build && npm run doc",
+    "preversion": "npm run clean && npm run build && npm test && npm run doc",
     "version": "git add -A",
     "postversion": "git push origin --tags",
-    "prepublishOnly": "npm run clean && npm run build && npm run doc"
+    "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.9.0-alpha.23"
+  "version": "22.9.0-alpha.24"
 }