@chevre/domain 21.24.0 → 21.24.1

package/example/src/chevre/findReservationByCode.ts

@@ -11,11 +11,11 @@ mongoose.Model.on('index', (...args) => {
 
 const CODE = '068cb0ba-8529-4a2b-8cf5-890d5af9c536';
 const RESERVATION_ID = '589701779538948-0';
+// const RESERVATION_ID = '589701779538948-1';
 
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const acceptedOfferRepo = await chevre.repository.AcceptedOffer.createInstance(mongoose.connection);
     const authorizationRepo = await chevre.repository.Code.createInstance(mongoose.connection);
     const orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
     const reservationRepo = await chevre.repository.Reservation.createInstance(mongoose.connection);
@@ -38,8 +38,8 @@ async function main() {
         code: CODE,
         id: RESERVATION_ID
     })({
-        acceptedOffer: acceptedOfferRepo,
         authorization: authorizationRepo,
+        order: orderRepo,
         reservation: reservationRepo
     });
     // tslint:disable-next-line:no-null-keyword

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

@@ -30,7 +30,6 @@ export declare class MongoRepository {
         };
         code: ICode;
     }): Promise<IObject>;
-    count(params: factory.authorization.ISearchConditions): Promise<number>;
     search(params: factory.authorization.ISearchConditions): Promise<factory.authorization.IAuthorization[]>;
     /**
      * 有効期限を一定期間過ぎた承認を削除する

package/lib/chevre/repo/code.js

@@ -119,7 +119,9 @@ class MongoRepository {
                 code: { $eq: String(params.code) },
                 validFrom: { $lte: now },
                 validUntil: { $gte: now }
-            }, { object: 1 })
+            }, { object: 1, _id: 0 })
+                // projection的にleanで十分
+                .lean()
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.authorizationModel.modelName);
@@ -127,14 +129,12 @@ class MongoRepository {
             return doc.object;
         });
     }
-    count(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            return this.authorizationModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-        });
-    }
+    // public async count(params: factory.authorization.ISearchConditions): Promise<number> {
+    //     const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
+    //     return this.authorizationModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
+    //         .setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
+    //         .exec();
+    // }
     search(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {

package/lib/chevre/repo/order.js

@@ -936,11 +936,13 @@ class MongoRepository {
                 } }, (typeof ((_a = params.seller) === null || _a === void 0 ? void 0 : _a.id) === 'string')
                 ? { 'seller.id': { $exists: true, $eq: params.seller.id } }
                 : undefined), projection)
+                // projection的にleanで十分
+                .lean()
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.orderModel.modelName);
             }
-            return doc.toObject();
+            return doc;
         });
     }
     /**

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

@@ -54,8 +54,8 @@ export declare class MongoRepository {
     }): Promise<factory.reservation.IReservation<factory.reservationType.EventReservation>[]>;
     findById<T extends factory.reservationType>(params: {
         id: string;
-        inclusion?: string[];
-        exclusion?: string[];
+        inclusion?: IKeyOfProjection[];
+        exclusion?: IKeyOfProjection[];
     }): Promise<factory.reservation.IReservation<T>>;
     confirmManyIfNotExist(params: {
         provider: factory.reservation.IProvider;
@@ -115,7 +115,7 @@ export declare class MongoRepository {
     updatePartiallyById(params: {
         id: string;
         update: IUpdatePartiallyParams;
-    }): Promise<Pick<factory.reservation.eventReservation.IReservation, 'id'>>;
+    }): Promise<void>;
     deleteByIds(params: {
         project: {
             id: string;

package/lib/chevre/repo/reservation.js

@@ -878,29 +878,6 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    // public async confirmByReservationNumber(params: {
-    //     reservationNumber: string;
-    //     previousReservationStatus: factory.reservationStatusType;
-    //     underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
-    //     broker?: factory.reservation.IBroker<factory.reservationType>;
-    //     issuedThrough?: factory.assetTransaction.reserve.IIssuedThrough;
-    // }): Promise<void> {
-    //     const conditions = {
-    //         reservationNumber: { $eq: String(params.reservationNumber) },
-    //         reservationStatus: { $eq: params.previousReservationStatus }
-    //     };
-    //     const update = {
-    //         // previousReservationStatusを保管(2023-01-19~)
-    //         previousReservationStatus: params.previousReservationStatus,
-    //         reservationStatus: factory.reservationStatusType.ReservationConfirmed,
-    //         modifiedTime: new Date(),
-    //         ...(params.underName !== undefined) ? { underName: params.underName } : undefined,
-    //         ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined,
-    //         ...(typeof params.issuedThrough?.typeOf === 'string') ? { issuedThrough: params.issuedThrough } : undefined
-    //     };
-    //     await this.reservationModel.updateMany(conditions, update)
-    //         .exec();
-    // }
     confirmManyIfNotExist(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const modifiedTime = new Date();
@@ -1101,7 +1078,6 @@ class MongoRepository {
                 if (doc === null) {
                     throw new factory.errors.ArgumentNull(this.reservationModel.modelName);
                 }
-                return doc.toObject();
             });
         });
     }

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

@@ -1,11 +1,15 @@
 import * as factory from '../../factory';
-import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as AuthorizationRepo } from '../../repo/code';
+import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as ReservationRepo } from '../../repo/reservation';
 type AvailableReservationType = factory.reservationType.BusReservation | factory.reservationType.EventReservation;
 type IReservationResult = Pick<factory.reservation.IReservation<AvailableReservationType>, 'id' | 'additionalTicketText' | 'reservationStatus'> & {
     reservedTicket: {
-        ticketType: Pick<factory.reservation.ITicketType<AvailableReservationType>, 'identifier' | 'name'>;
+        ticketType: Pick<factory.reservation.ITicketType<AvailableReservationType>, 'identifier'> & {
+            name: {
+                ja?: string;
+            };
+        };
     };
 };
 declare function findByCode(params: {
@@ -20,9 +24,12 @@ declare function findByCode(params: {
      * 注文コード
      */
     code: string;
+    seller?: {
+        id?: string;
+    };
 }): (repos: {
-    acceptedOffer: AcceptedOfferRepo;
     authorization: AuthorizationRepo;
+    order: OrderRepo;
     reservation: ReservationRepo;
 }) => Promise<{
     reservation: IReservationResult;

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

@@ -13,72 +13,49 @@ exports.findByCode = void 0;
 const factory = require("../../factory");
 function findByCode(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         if (typeof params.id !== 'string' || params.id.length === 0) {
             throw new factory.errors.ArgumentNull('id');
         }
         if (typeof params.code !== 'string' || params.code.length === 0) {
             throw new factory.errors.ArgumentNull('code');
         }
+        const reservationId = String(params.id);
         const authorizationObject = yield repos.authorization.findValidObjectByCode({
             project: { id: params.project.id },
             code: params.code
         });
-        let reservationIdInOrder;
-        let reservationTypeInOrder;
-        let offeredThroughIdentifier = factory.service.webAPI.Identifier.Chevre;
         switch (authorizationObject.typeOf) {
             case factory.order.OrderType.Order:
                 const { orderNumber } = authorizationObject;
                 if (typeof orderNumber === 'string' && orderNumber.length > 0) {
-                    const acceptedOffer = (yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
-                        limit: 1,
-                        page: 1,
-                        project: { id: { $eq: params.project.id } },
-                        orderNumber: { $eq: String(orderNumber) },
-                        acceptedOffers: { itemOffered: { id: { $eq: String(params.id) } } }
-                    }, ['itemOffered', 'offeredThrough'])).shift();
-                    const itemOfferedTypeOf = acceptedOffer === null || acceptedOffer === void 0 ? void 0 : acceptedOffer.itemOffered.typeOf;
-                    if (itemOfferedTypeOf === factory.reservationType.BusReservation
-                        || itemOfferedTypeOf === factory.reservationType.EventReservation) {
-                        reservationIdInOrder = acceptedOffer === null || acceptedOffer === void 0 ? void 0 : acceptedOffer.itemOffered.id;
-                        reservationTypeInOrder = itemOfferedTypeOf;
-                        offeredThroughIdentifier = (_a = acceptedOffer === null || acceptedOffer === void 0 ? void 0 : acceptedOffer.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier;
-                    }
+                    // reservationIdを含む注文の存在を確認するだけでよい
+                    yield repos.order.findByOrderNumberAndReservationId({
+                        project: { id: params.project.id },
+                        orderNumber,
+                        reservationId,
+                        seller: params.seller
+                    });
                 }
                 break;
             default:
                 throw new factory.errors.NotImplemented(`authorization object typeOf: ${authorizationObject.typeOf} not implemented`);
         }
-        let reservation;
-        if (typeof reservationIdInOrder === 'string' && typeof reservationTypeInOrder === 'string') {
-            switch (offeredThroughIdentifier) {
-                // COA対応
-                case factory.service.webAPI.Identifier.COA:
-                    throw new factory.errors.NotImplemented(`offeredThroughIdentifier: ${offeredThroughIdentifier} not implemented`);
-                default:
-                    const reservationFromRepo = (yield repos.reservation.search({
-                        project: { id: { $eq: params.project.id } },
-                        typeOf: reservationTypeInOrder,
-                        id: { $eq: reservationIdInOrder }
-                    }, { id: 1, additionalTicketText: 1, reservationStatus: 1, reservedTicket: 1 })).shift();
-                    if (reservationFromRepo !== undefined) {
-                        const { id, additionalTicketText, reservationStatus, reservedTicket } = reservationFromRepo;
-                        reservation = {
-                            id, additionalTicketText, reservationStatus,
-                            reservedTicket: {
-                                ticketType: {
-                                    identifier: reservedTicket.ticketType.identifier,
-                                    name: { ja: (_b = reservedTicket.ticketType.name) === null || _b === void 0 ? void 0 : _b.ja }
-                                }
-                            }
-                        };
-                    }
+        const reservationFromRepo = yield repos.reservation.findById({
+            id: reservationId,
+            inclusion: ['id', 'additionalTicketText', 'reservationStatus', 'reservedTicket'],
+            exclusion: []
+        });
+        const { id, additionalTicketText, reservationStatus, reservedTicket } = reservationFromRepo;
+        const reservation = {
+            id, additionalTicketText, reservationStatus,
+            reservedTicket: {
+                ticketType: {
+                    identifier: reservedTicket.ticketType.identifier,
+                    name: { ja: (_a = reservedTicket.ticketType.name) === null || _a === void 0 ? void 0 : _a.ja }
+                }
             }
-        }
-        if (reservation === undefined) {
-            throw new factory.errors.NotFound('Reservation');
-        }
+        };
         return { reservation };
     });
 }

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.24.0"
+  "version": "21.24.1"
 }