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

package/example/src/chevre/migrateReservationProvider.ts

@@ -0,0 +1,107 @@
+// tslint:disable:no-console
+// import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+// const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
+
+    const reservationRepo = new chevre.repository.Reservation(mongoose.connection);
+    const placeRepo = new chevre.repository.Place(mongoose.connection);
+
+    const cursor = reservationRepo.getCursor(
+        {
+            typeOf: {
+                $in: [
+                    chevre.factory.reservationType.EventReservation
+                ]
+            }
+            // bookingTime: {
+            //     $gte: moment('2023-06-09T00:00:00Z')
+            //         .toDate()
+            // }
+            // organizer: { $exists: false }
+        },
+        {
+            _id: 1,
+            project: 1,
+            provider: 1,
+            bookingTime: 1,
+            reservationFor: 1
+        }
+    );
+    console.log('reservations found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const reservation: Pick<
+            chevre.factory.reservation.IReservation<chevre.factory.reservationType.EventReservation>,
+            'id' | 'project' | 'provider' | 'bookingTime' | 'reservationFor'
+        > = doc.toObject();
+
+        const providerId = reservation.provider?.id;
+        const alreadyMigrated = typeof providerId === 'string';
+
+        if (alreadyMigrated) {
+            console.log('already exist...', reservation.project.id, reservation.id, reservation.bookingTime, providerId, i);
+        } else {
+            const movieTheaterId: string = reservation.reservationFor.superEvent.location.id;
+            const movieTheaterBranchCode: string = reservation.reservationFor.superEvent.location.branchCode;
+            const movieTheaters = <Pick<
+                chevre.factory.place.movieTheater.IPlaceWithoutScreeningRoom,
+                'parentOrganization' | 'branchCode'
+            >[]>
+                await placeRepo.searchMovieTheaters(
+                    {
+                        limit: 1,
+                        page: 1,
+                        project: { id: { $eq: reservation.project.id } },
+                        id: { $eq: movieTheaterId }
+                    },
+                    ['parentOrganization', 'branchCode'],
+                    []
+                );
+            const movieTheater = movieTheaters.shift();
+            const sellerId = movieTheater?.parentOrganization?.id;
+            console.log(
+                'movieTheater found',
+                reservation.project.id, reservation.id, reservation.bookingTime, providerId, 'sellerId:', sellerId,
+                'movieTheaterId:', movieTheaterId,
+                'movieTheaterBranchCode:', movieTheaterBranchCode,
+                i
+            );
+            if (typeof sellerId !== 'string') {
+                throw new Error('movieTheater not found');
+            }
+            if (typeof sellerId === 'string') {
+                const newProvider: chevre.factory.reservation.IProvider = {
+                    id: sellerId,
+                    typeOf: chevre.factory.organizationType.Corporation
+                };
+                console.log('updating reservation...', reservation.project.id, reservation.id, reservation.bookingTime, providerId, i);
+                await reservationRepo.updatePartiallyById({
+                    id: reservation.id,
+                    update: <any>{
+                        provider: newProvider
+                    }
+                });
+                updateCount += 1;
+                console.log('updated.', reservation.project.id, reservation.id, reservation.bookingTime, providerId, i);
+            }
+        }
+    });
+
+    console.log(i, 'reservations checked');
+    console.log(updateCount, 'reservations updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -77,6 +77,9 @@ export declare class MongoRepository {
     findByOrderNumberAndReservationId(params: {
         orderNumber: string;
         reservationId: string;
+        seller?: {
+            id?: string;
+        };
     }): Promise<Pick<factory.order.IOrder, 'orderNumber' | 'orderStatus' | 'typeOf'>>;
     /**
      * 注文番号で削除する

package/lib/chevre/repo/order.js

@@ -853,6 +853,7 @@ class MongoRepository {
         });
     }
     findByOrderNumberAndReservationId(params) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const projection = {
                 orderStatus: 1,
@@ -860,15 +861,14 @@ class MongoRepository {
                 orderNumber: 1,
                 _id: 0
             };
-            const doc = yield this.orderModel.findOne({
-                orderNumber: { $eq: params.orderNumber },
-                acceptedOffers: {
+            const doc = yield this.orderModel.findOne(Object.assign({ orderNumber: { $eq: params.orderNumber }, acceptedOffers: {
                     $elemMatch: {
                         'itemOffered.typeOf': { $in: [factory.reservationType.BusReservation, factory.reservationType.EventReservation] },
                         'itemOffered.id': { $eq: params.reservationId }
                     }
-                }
-            }, projection)
+                } }, (typeof ((_a = params.seller) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                ? { 'seller.id': { $exists: true, $eq: params.seller.id } }
+                : undefined), projection)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.orderModel.modelName);

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

@@ -1,3 +1,27 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
 import { BulkWriteResult as BulkWriteOpResultObject } from 'mongodb';
 import { Connection, UpdateWriteOpResult } from 'mongoose';
 import * as factory from '../factory';
@@ -91,7 +115,7 @@ export declare class MongoRepository {
     updatePartiallyById(params: {
         id: string;
         update: IUpdatePartiallyParams;
-    }): Promise<factory.reservation.eventReservation.IReservation>;
+    }): Promise<Pick<factory.reservation.eventReservation.IReservation, 'id'>>;
     deleteByIds(params: {
         project: {
             id: string;
@@ -119,4 +143,5 @@ export declare class MongoRepository {
         };
     }): Promise<string[]>;
     deleteReservedTicketUnderName(): Promise<import("mongodb").UpdateResult>;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
 }

package/lib/chevre/repo/reservation.js

@@ -1112,10 +1112,10 @@ class MongoRepository {
     /**
      * 予約部分更新
      */
-    // public async findByIdAndUpdate(params: {
     updatePartiallyById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.reservationModel.findOneAndUpdate({ _id: { $eq: params.id } }, params.update, { new: true })
+                .select({ _id: 1 })
                 .exec()
                 .then((doc) => {
                 if (doc === null) {
@@ -1185,5 +1185,10 @@ class MongoRepository {
                 .exec();
         });
     }
+    getCursor(conditions, projection) {
+        return this.reservationModel.find(conditions, projection)
+            .sort({ bookingTime: factory.sortType.Descending })
+            .cursor();
+    }
 }
 exports.MongoRepository = MongoRepository;

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

@@ -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

@@ -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

@@ -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.15"
+  "version": "21.4.0-alpha.16"
 }