@chevre/domain 21.2.0-alpha.71 → 21.2.0-alpha.72

package/lib/chevre/repo/mongoose/schemas/order.d.ts

@@ -64,9 +64,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     project?: any;
     orderNumber?: string | undefined;
     seller?: any;
+    broker?: any;
     price?: number | undefined;
     priceCurrency?: string | undefined;
-    broker?: any;
     customer?: any;
     returner?: any;
     confirmationNumber?: string | undefined;
@@ -87,9 +87,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     project?: any;
     orderNumber?: string | undefined;
     seller?: any;
+    broker?: any;
     price?: number | undefined;
     priceCurrency?: string | undefined;
-    broker?: any;
     customer?: any;
     returner?: any;
     confirmationNumber?: string | undefined;
@@ -110,9 +110,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     project?: any;
     orderNumber?: string | undefined;
     seller?: any;
+    broker?: any;
     price?: number | undefined;
     priceCurrency?: string | undefined;
-    broker?: any;
     customer?: any;
     returner?: any;
     confirmationNumber?: string | undefined;

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

@@ -62,16 +62,16 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     additionalProperty?: any;
     reservationFor?: any;
     subReservation?: any;
+    broker?: any;
     price?: any;
     priceCurrency?: string | undefined;
+    issuedThrough?: any;
+    reservedTicket?: any;
     additionalTicketText?: string | undefined;
     bookingTime?: Date | undefined;
-    broker?: any;
-    issuedThrough?: any;
     modifiedTime?: Date | undefined;
     numSeats?: number | undefined;
     programMembershipUsed?: any;
-    reservedTicket?: any;
     underName?: any;
     bookingAgent?: any;
     cancelReservationUrl?: string | undefined;
@@ -90,16 +90,16 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     additionalProperty?: any;
     reservationFor?: any;
     subReservation?: any;
+    broker?: any;
     price?: any;
     priceCurrency?: string | undefined;
+    issuedThrough?: any;
+    reservedTicket?: any;
     additionalTicketText?: string | undefined;
     bookingTime?: Date | undefined;
-    broker?: any;
-    issuedThrough?: any;
     modifiedTime?: Date | undefined;
     numSeats?: number | undefined;
     programMembershipUsed?: any;
-    reservedTicket?: any;
     underName?: any;
     bookingAgent?: any;
     cancelReservationUrl?: string | undefined;
@@ -118,16 +118,16 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     additionalProperty?: any;
     reservationFor?: any;
     subReservation?: any;
+    broker?: any;
     price?: any;
     priceCurrency?: string | undefined;
+    issuedThrough?: any;
+    reservedTicket?: any;
     additionalTicketText?: string | undefined;
     bookingTime?: Date | undefined;
-    broker?: any;
-    issuedThrough?: any;
     modifiedTime?: Date | undefined;
     numSeats?: number | undefined;
     programMembershipUsed?: any;
-    reservedTicket?: any;
     underName?: any;
     bookingAgent?: any;
     cancelReservationUrl?: string | undefined;

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

@@ -12,8 +12,8 @@ function createStartParams(params) {
     var _a;
     const reservationNumber = params.reservationNumber;
     const reservationPackage = Object.assign({ 
-        // clientUser: params.object.clientUser,
-        project: params.project, reservationNumber: reservationNumber, typeOf: factory.reservationType.ReservationPackage }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined);
+        // project: params.project,
+        reservationNumber: reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, typeOf: factory.reservationType.ReservationPackage }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined);
     return {
         project: { id: params.project.id, typeOf: factory.organizationType.Project },
         typeOf: factory.assetTransactionType.Reserve,
@@ -467,7 +467,9 @@ function createPotentialActions(params) {
                 underName
             }));
         });
-        const reservationPackage = Object.assign({ reservationFor, reservationNumber: transaction.object.reservationNumber, reservationStatus: pendingReservations[0].reservationStatus, 
+        const reservationPackage = Object.assign({ reservationFor, reservationNumber: transaction.object.reservationNumber, reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
+                ? params.transaction.object.reservationStatus
+                : factory.reservationStatusType.ReservationPending, 
             // 不要なので廃止(2023-01-19~)
             // subReservation: pendingReservations,
             typeOf: factory.reservationType.ReservationPackage }, (typeof (underName === null || underName === void 0 ? void 0 : underName.typeOf) === 'string') ? { underName } : undefined);
@@ -521,11 +523,11 @@ function createMoneyTransferActions(params) {
         && typeof pointAwardToLocationIdentifier === 'string'
         && typeof pointAwardToLocationTypeOf === 'string') {
         const fromLocation = {
-            typeOf: (typeof ((_f = params.reservation.underName) === null || _f === void 0 ? void 0 : _f.typeOf) === 'string')
-                ? params.reservation.underName.typeOf
+            typeOf: (typeof ((_f = params.reservation.reservedTicket.issuedBy) === null || _f === void 0 ? void 0 : _f.typeOf) === 'string')
+                ? params.reservation.reservedTicket.issuedBy.typeOf
                 : params.transaction.typeOf,
-            name: (typeof ((_g = params.reservation.underName) === null || _g === void 0 ? void 0 : _g.name) === 'string')
-                ? params.reservation.underName.name
+            name: (typeof ((_g = params.reservation.reservedTicket.issuedBy) === null || _g === void 0 ? void 0 : _g.name) === 'string')
+                ? params.reservation.reservedTicket.issuedBy.name
                 : params.transaction.id
         };
         const toLocation = {
@@ -566,7 +568,9 @@ function createPendingReservationAction(params) {
             typeOf: factory.reservationType.ReservationPackage,
             reservationNumber: transaction.transactionNumber,
             reservationFor: { typeOf: reservationFor.typeOf, id: String(reservationFor.id) },
-            reservationStatus: pendingReservations[0].reservationStatus
+            reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
+                ? params.transaction.object.reservationStatus
+                : factory.reservationStatusType.ReservationPending
         };
         cancelActionAttributes = [{
                 project: transaction.project,

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

@@ -135,6 +135,12 @@ function addReservations(params) {
         })(repos);
         // 予約イベント最適化
         const reservationFor = (0, factory_1.createReservationFor)(event);
+        const minimizedObjectSubReservations = objectSubReservations.map((r) => {
+            var _a;
+            return Object.assign({ id: r.id, typeOf: r.typeOf, reservedTicket: Object.assign({ ticketType: r.reservedTicket.ticketType }, (typeof ((_a = r.reservedTicket.ticketedSeat) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+                    ? { ticketedSeat: r.reservedTicket.ticketedSeat }
+                    : undefined) }, (Array.isArray(r.subReservation)) ? { subReservation: r.subReservation } : undefined);
+        });
         // 取引に予約追加
         let lockedOfferRateLimitKeys = [];
         try {
@@ -146,7 +152,9 @@ function addReservations(params) {
                     acceptedOffer: acceptedOffers4transactionObject,
                     reservationFor,
                     // subReservationにreservationForを保管しない(2021-10-19～)
-                    subReservation: objectSubReservations
+                    // 最適化(2023-05-29~)
+                    // subReservation: objectSubReservations
+                    subReservation: minimizedObjectSubReservations
                 }
             });
         }

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

@@ -5,7 +5,6 @@ import { RedisRepository as OfferRateLimitRepo } from '../../repo/rateLimit/offe
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
 import { StockHolderRepository as StockHolderRepo } from '../../repo/stockHolder';
 import { MongoRepository as TaskRepo } from '../../repo/task';
-type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 /**
  * 進行中の予約をキャンセルする
  */
@@ -29,7 +28,10 @@ declare function cancelReservation(actionAttributesList: factory.action.cancel.r
     assetTransaction: AssetTransactionRepo;
 }) => Promise<void>;
 declare function processUnlockOfferRateLimit(params: {
-    reservation: Pick<IObjectSubReservation, 'reservationNumber' | 'reservedTicket'>;
+    reservation: {
+        reservationNumber: string;
+        reservedTicket: factory.assetTransaction.reserve.IObjectSubReservationReservedTicket;
+    };
     reservationFor: factory.assetTransaction.reserve.IReservationFor;
 }): (repos: {
     offerRateLimit: OfferRateLimitRepo;

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.313.0-alpha.12",
+    "@chevre/factory": "4.313.0-alpha.13",
     "@cinerino/sdk": "3.157.0-alpha.2",
     "@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.71"
+  "version": "21.2.0-alpha.72"
 }