@chevre/domain 24.0.0-alpha.52 → 24.0.0-alpha.54

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

@@ -7,6 +7,9 @@ export interface IUpdatePartiallyParams {
 }
 export type ICancelResult = UpdateWriteOpResult;
 export type ICheckedInResult = UpdateWriteOpResult;
+/**
+ * ドキュメントとして保管する予約
+ */
 export type ICreatingReservation = Omit<factory.reservation.eventReservation.IReservation, 'id' | 'price' | 'reservedTicket'> & {
     _id: string;
     /**

package/lib/chevre/repo/reservation.js

@@ -28,6 +28,7 @@ const reservation_1 = require("./mongoose/schemas/reservation");
 const factory = __importStar(require("../factory"));
 const createMongoConditions_1 = require("./factory/reservation/createMongoConditions");
 const settings_1 = require("../settings");
+const USE_DISCONTINUED_RESERVATION_PRICE = process.env.USE_DISCONTINUED_RESERVATION_PRICE === '1';
 /**
  * 予約リポジトリ
  */
@@ -136,30 +137,27 @@ class ReservationRepo {
         const bulkWriteOps = [];
         if (Array.isArray(params.subReservation)) {
             params.subReservation.forEach((subReservation) => {
-                let setOnInsert;
-                switch (subReservation.typeOf) {
-                    case factory.reservationType.EventReservation:
-                        setOnInsert = {
-                            ...subReservation,
-                            _id: subReservation.id,
-                            bookingTime: params.bookingTime,
-                            checkedIn: false,
-                            attended: false,
-                            issuedThrough: params.issuedThrough,
-                            project: { id: params.project.id, typeOf: factory.organizationType.Project },
-                            reservationFor: params.reservationFor,
-                            reservationNumber: params.reservationNumber,
-                            reservationStatus: factory.reservationStatusType.ReservationConfirmed,
-                            modifiedTime,
-                            // providerを追加(2023-07-19~)
-                            provider: params.provider,
-                            ...(params.underName !== undefined) ? { underName: params.underName } : undefined,
-                            ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined
-                        };
-                        break;
-                    default:
-                        throw new factory.errors.NotImplemented(`${subReservation.typeOf} not implemented`);
-                }
+                const { price, reservedTicket, ...subReservationWithoutPrice } = subReservation;
+                // const { ticketType, ...reservedTicketWithoutTicketType } = reservedTicket;
+                const setOnInsert = {
+                    ...subReservationWithoutPrice,
+                    typeOf: factory.reservationType.EventReservation,
+                    _id: subReservation.id,
+                    bookingTime: params.bookingTime,
+                    checkedIn: false,
+                    attended: false,
+                    issuedThrough: params.issuedThrough,
+                    project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                    reservationFor: params.reservationFor,
+                    reservationNumber: params.reservationNumber,
+                    reservationStatus: factory.reservationStatusType.ReservationConfirmed,
+                    modifiedTime,
+                    provider: params.provider,
+                    reservedTicket,
+                    ...(params.underName !== undefined) ? { underName: params.underName } : undefined,
+                    ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined,
+                    ...((USE_DISCONTINUED_RESERVATION_PRICE) && { price }) // discontinue price(2026-03-31~)
+                };
                 bulkWriteOps.push({
                     updateOne: {
                         filter: { _id: { $eq: subReservation.id } },

package/lib/chevre/service/assetTransaction/pay/start/preStart/validateAcceptedPaymentMethodIfNeeded.js

@@ -95,7 +95,7 @@ function validateAcceptedPaymentMethodIfNeeded(params
             // 対面決済ではひとまず対応決済方法検証なし
         }
         debug('validateAcceptedPaymentMethodIfNeeded: checkingEventIds:', checkingEventIds, paymentServiceType);
-        if (Array.isArray(checkingEventIds) && paymentService !== undefined) {
+        if (Array.isArray(checkingEventIds)) {
             // 検証対象のイベントIDが存在する場合、その数が0ということはありえない
             if (checkingEventIds.length === 0) {
                 throw new factory.errors.ArgumentNull('object.serviceOutput.referencesOrder.orderedItem');
@@ -113,15 +113,17 @@ function validateAcceptedPaymentMethodIfNeeded(params
             const uniqueEventSeriesIds = [...new Set(eventSeriesIds)];
             debug('validateAcceptedPaymentMethodIfNeeded: eventSeries with AggregateOffer?', uniqueEventSeriesIds);
             // 決済方法に設定されたカスタム検証URLに依存する場合はこちら↓
-            const customValidationUrl = paymentService.availableChannel?.customValidationUrl;
-            if (typeof customValidationUrl === 'string' && customValidationUrl !== '') {
-                await validateByCustomUrl({
-                    customValidationUrl,
-                    eventSeriesIds: uniqueEventSeriesIds,
-                    paymentMethodType: paymentService.serviceType.codeValue,
-                    // amount: number,
-                    now
-                });
+            if (paymentService !== undefined) {
+                const customValidationUrl = paymentService.availableChannel?.customValidationUrl;
+                if (typeof customValidationUrl === 'string' && customValidationUrl !== '') {
+                    await validateByCustomUrl({
+                        customValidationUrl,
+                        eventSeriesIds: uniqueEventSeriesIds,
+                        paymentMethodType: paymentService.serviceType.codeValue,
+                        // amount: number,
+                        now
+                    });
+                }
             }
             // トークンで検証する場合はこち↓
             // // 指定された全トークンを抽出

package/package.json

@@ -31,17 +31,15 @@
   },
   "description": "Chevre Domain Library for Node.js",
   "devDependencies": {
-    "@eslint/js": "10.0.1",
+    "@eslint/js": "9.39.4",
     "@json2csv/plainjs": "7.0.6",
     "@sendgrid/helpers": "8.0.0",
     "@size-limit/preset-big-lib": "12.0.0",
     "@types/debug": "0.0.30",
     "@types/google-libphonenumber": "^7.4.19",
     "@types/http-status": "^0.2.30",
-    "@types/json2csv": "^4.5.1",
     "@types/jsonwebtoken": "9.0.1",
     "@types/lodash.difference": "^4.5.6",
-    "@types/moment-timezone": "^0.5.30",
     "@types/node": "22.19.7",
     "@types/pug": "2.0.10",
     "@types/uniqid": "^4.1.3",
@@ -53,10 +51,10 @@
     "eslint": "9.39.2",
     "googleapis": "^85.0.0",
     "jose": "6.0.12",
-    "json2csv": "4.5.4",
+    "mongodb": "6.20.0",
     "mongoose": "8.23.0",
     "redis": "4.6.5",
-    "rimraf": "^2.7.1",
+    "rimraf": "2.7.1",
     "size-limit": "12.0.0",
     "typescript": "5.6.3",
     "typescript-eslint": "8.55.0",
@@ -99,5 +97,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.0.0-alpha.52"
+  "version": "24.0.0-alpha.54"
 }