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

package/example/src/chevre/createDeleteTransactionTasksOfDeletedPeople.ts

@@ -0,0 +1,126 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+const USERPOOL_ID_NEW = String(process.env.USERPOOL_ID_NEW);
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const now = new Date();
+
+    const actionRepo = new chevre.repository.Action(mongoose.connection);
+    const orderRepo = new chevre.repository.Order(mongoose.connection);
+    const personRepo = new chevre.repository.Person({ userPoolId: USERPOOL_ID_NEW });
+    const taskRepo = new chevre.repository.Task(mongoose.connection);
+
+    const cursor = orderRepo.getCursor(
+        {
+            'project.id': { $eq: project.id },
+            'customer.typeOf': { $eq: chevre.factory.personType.Person },
+            'acceptedOffers.itemOffered.typeOf': { $exists: true.valueOf, $eq: chevre.factory.reservationType.EventReservation }
+        },
+        {
+            _id: 1,
+            project: 1,
+            orderNumber: 1,
+            orderDate: 1,
+            customer: 1
+        }
+    );
+    console.log('orders found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const order = <Pick<chevre.factory.order.IOrder, 'id' | 'orderDate' | 'orderNumber' | 'customer' | 'project'>>doc.toObject();
+
+        // person検索
+        console.log('seaching person....', order.project.id, order.orderNumber, order.orderDate, order.customer.id, i);
+        const people = await personRepo.search({ id: String(order.customer.id) });
+        const person = people.shift();
+        const activePerson = (<any>person).Enabled === true;
+        if (activePerson) {
+            // activeであれば何もしない
+            console.log(
+                'person found', order.project.id, order.orderNumber, order.orderDate,
+                person?.memberOf?.membershipNumber,
+                (<any>person).Enabled, i);
+        } else {
+            // migrateアクション検索
+            const deletePersonActions = <chevre.factory.action.update.deleteAction.member.IAction[]>await actionRepo.search(
+                {
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: order.project.id } },
+                    actionStatus: { $in: [chevre.factory.actionStatusType.CompletedActionStatus] },
+                    typeOf: { $eq: chevre.factory.actionType.DeleteAction },
+                    object: {
+                        id: { $eq: order.customer.id },
+                        typeOf: { $eq: chevre.factory.personType.Person }
+                    }
+                },
+                [],
+                []
+            );
+            const deletePersonAction = deletePersonActions.shift();
+            if (deletePersonAction !== undefined) {
+                // migrateアクションがあれば何もしない
+                const migratedUser: boolean = deletePersonAction.object.migrate === true;
+                console.log('migratedUser:', migratedUser);
+                if (migratedUser) {
+                    console.log(
+                        'person migrated', order.project.id, order.orderNumber, order.orderDate,
+                        person?.memberOf?.membershipNumber, i);
+
+                    return;
+                }
+            }
+
+            console.log(
+                'creating task...', order.project.id, order.orderNumber, order.orderDate,
+                person?.memberOf?.membershipNumber, i);
+            // task作成
+            const deleteTransactionTasks: chevre.factory.task.deleteTransaction.IAttributes[] = [
+                chevre.factory.transactionType.MoneyTransfer,
+                chevre.factory.transactionType.PlaceOrder,
+                chevre.factory.transactionType.ReturnOrder
+            ].map((transactionType) => {
+                return {
+                    project: { id: order.project.id, typeOf: chevre.factory.organizationType.Project },
+                    name: chevre.factory.taskName.DeleteTransaction,
+                    status: chevre.factory.taskStatus.Ready,
+                    runsAt: now,
+                    remainingNumberOfTries: 3,
+                    numberOfTried: 0,
+                    executionResults: [],
+                    data: {
+                        object: {
+                            specifyingMethod: chevre.factory.task.deleteTransaction.SpecifyingMethod.AgentId,
+                            agent: { id: order.customer.id },
+                            project: { id: order.project.id },
+                            typeOf: transactionType
+                        }
+                    }
+                };
+            });
+            // console.log(deleteTransactionTasks);
+            await taskRepo.saveMany(deleteTransactionTasks, { emitImmediately: false });
+            updateCount += 1;
+            console.log(
+                'task created.', order.project.id, order.orderNumber, order.orderDate,
+                person?.memberOf?.membershipNumber, i);
+        }
+    });
+
+    console.log(i, 'orders checked');
+    console.log(updateCount, 'tasks created');
+}
+
+main()
+    .then()
+    .catch(console.error);

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/example/src/chevre/processReserve.ts

@@ -69,7 +69,6 @@ async function main() {
         validateEvent: false,
         validateEventOfferPeriod: false,
         validateAppliesToMovieTicket: true,
-        disablePendingReservations: true,
         stockHoldUntilDaysAfterEventEnd: 31,
         useHoldStockByTransactionNumber: true
     })({

package/lib/chevre/factory/event.d.ts

@@ -1,2 +1,2 @@
 import * as factory from '../factory';
-export type IMinimizedIndividualEvent<T extends factory.eventType.ScreeningEvent | factory.eventType.Event> = T extends factory.eventType.ScreeningEvent ? Pick<factory.event.IEvent<T>, 'project' | 'id' | 'typeOf' | 'additionalProperty' | 'name' | 'doorTime' | 'endDate' | 'eventStatus' | 'location' | 'startDate' | 'superEvent' | 'offers' | 'coaInfo' | 'identifier'> : T extends factory.eventType.Event ? Pick<factory.event.IEvent<T>, 'project' | 'id' | 'typeOf' | 'additionalProperty' | 'name' | 'doorTime' | 'endDate' | 'eventStatus' | 'location' | 'startDate' | 'offers'> : never;
+export type IMinimizedIndividualEvent<T extends factory.eventType.ScreeningEvent | factory.eventType.Event> = T extends factory.eventType.ScreeningEvent ? Pick<factory.event.IEvent<T>, 'project' | 'organizer' | 'id' | 'typeOf' | 'additionalProperty' | 'name' | 'doorTime' | 'endDate' | 'eventStatus' | 'location' | 'startDate' | 'superEvent' | 'offers' | 'coaInfo' | 'identifier'> : T extends factory.eventType.Event ? Pick<factory.event.IEvent<T>, 'project' | 'organizer' | 'id' | 'typeOf' | 'additionalProperty' | 'name' | 'doorTime' | 'endDate' | 'eventStatus' | 'location' | 'startDate' | 'offers'> : never;

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

@@ -67,7 +67,10 @@ export declare class MongoRepository {
     addReservations(params: {
         typeOf: factory.assetTransactionType.Reserve;
         id: string;
-        object: Pick<factory.assetTransaction.reserve.IObject, 'acceptedOffer' | 'issuedThrough' | 'reservationFor' | 'subReservation'>;
+        object: Pick<factory.assetTransaction.reserve.IObject, 'acceptedOffer' | 'issuedThrough' | 'reservationFor' | 'subReservation'> & {
+            issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
+            reservationFor: factory.assetTransaction.reserve.IReservationFor;
+        };
     }): Promise<factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>>;
     /**
      * 取引を確定する

package/lib/chevre/repo/assetTransaction.js

@@ -319,23 +319,17 @@ class MongoRepository {
         });
     }
     addReservations(params) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.transactionModel.findOneAndUpdate({
                 _id: { $eq: params.id },
                 typeOf: { $eq: params.typeOf },
                 status: { $eq: factory.transactionStatusType.InProgress }
-            }, Object.assign({ 'object.acceptedOffer': params.object.acceptedOffer, 
-                // 念のため残す(2021/10/14)が、そのうち削除
-                // 冗長なので削除(2021/10/19～)
-                // 'object.event': params.object.reservationFor,
-                'object.reservationFor': params.object.reservationFor, 
-                // 念のため残す(2021/10/14)が、そのうち削除
-                // 冗長なので削除(2021/10/19～)
-                // 'object.reservations': params.object.subReservation,
-                'object.subReservation': params.object.subReservation }, (typeof ((_a = params.object.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-                ? { 'object.issuedThrough': params.object.issuedThrough }
-                : undefined), { new: true })
+            }, {
+                'object.acceptedOffer': params.object.acceptedOffer,
+                'object.issuedThrough': params.object.issuedThrough,
+                'object.reservationFor': params.object.reservationFor,
+                'object.subReservation': params.object.subReservation
+            }, { new: true })
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.transactionModel.modelName);

package/lib/chevre/repo/event.js

@@ -28,6 +28,7 @@ const errorHandler_1 = require("../errorHandler");
 const settings_1 = require("../settings");
 exports.PROJECTION_MINIMIZED_EVENT = {
     project: 1,
+    organizer: 1,
     _id: 1,
     typeOf: 1,
     additionalProperty: 1,

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

@@ -54,9 +54,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
 }, {
     typeOf: string;
     project: any;
+    organizer: any;
     checkInCount: number;
     attendeeCount: number;
-    organizer: any;
     _id?: string | undefined;
     name?: any;
     alternateName?: any;
@@ -88,9 +88,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     typeOf: string;
     project: any;
+    organizer: any;
     checkInCount: number;
     attendeeCount: number;
-    organizer: any;
     _id?: string | undefined;
     name?: any;
     alternateName?: any;
@@ -122,9 +122,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
 }>> & Omit<import("mongoose").FlatRecord<{
     typeOf: string;
     project: any;
+    organizer: any;
     checkInCount: number;
     attendeeCount: number;
-    organizer: any;
     _id?: string | undefined;
     name?: any;
     alternateName?: any;

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

@@ -54,9 +54,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
 }, {
     typeOf: string;
     additionalProperty: any[];
+    provider: any[];
     offers: any[];
     productID: string;
-    provider: any[];
     name?: any;
     project?: any;
     description?: any;
@@ -67,9 +67,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     typeOf: string;
     additionalProperty: any[];
+    provider: any[];
     offers: any[];
     productID: string;
-    provider: any[];
     name?: any;
     project?: any;
     description?: any;
@@ -80,9 +80,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
 }>> & Omit<import("mongoose").FlatRecord<{
     typeOf: string;
     additionalProperty: any[];
+    provider: any[];
     offers: any[];
     productID: string;
-    provider: any[];
     name?: any;
     project?: any;
     description?: any;

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

@@ -67,6 +67,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     underName?: any;
     issuedThrough?: any;
     subReservation?: any;
+    provider?: any;
     reservedTicket?: any;
     additionalTicketText?: string | undefined;
     bookingTime?: Date | undefined;
@@ -95,6 +96,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     underName?: any;
     issuedThrough?: any;
     subReservation?: any;
+    provider?: any;
     reservedTicket?: any;
     additionalTicketText?: string | undefined;
     bookingTime?: Date | undefined;
@@ -123,6 +125,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     underName?: any;
     issuedThrough?: any;
     subReservation?: any;
+    provider?: any;
     reservedTicket?: any;
     additionalTicketText?: string | undefined;
     bookingTime?: Date | undefined;

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

@@ -10,6 +10,7 @@ exports.modelName = modelName;
  */
 const schema = new mongoose_1.Schema({
     project: mongoose_1.SchemaTypes.Mixed,
+    provider: mongoose_1.SchemaTypes.Mixed,
     _id: String,
     typeOf: {
         type: String,
@@ -74,9 +75,11 @@ exports.schema = schema;
 schema.index({ createdAt: 1 }, { name: 'searchByCreatedAt' });
 schema.index({ updatedAt: 1 }, { name: 'searchByUpdatedAt' });
 schema.index({ bookingTime: -1 }, { name: 'searchByBookingTime-v3' });
-schema.index({ 'project.id': 1, bookingTime: -1 }, {
-    name: 'searchByProjectId-v20220721'
-});
+schema.index({ 'project.id': 1, bookingTime: -1 }, { name: 'searchByProjectId-v20220721' });
+// schema.index(
+//     { 'provider.id': 1, bookingTime: -1 },
+//     { name: 'searchByProviderId' }
+// );
 schema.index({ typeOf: 1, bookingTime: -1 }, { name: 'searchByTypeOf-v3' });
 schema.index({ reservationNumber: 1, bookingTime: -1 }, { name: 'searchByReservationNumber-v3' });
 schema.index({ reservationStatus: 1, bookingTime: -1 }, { name: 'searchByReservationStatus-v3' });

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';
@@ -6,6 +30,11 @@ export interface IUpdatePartiallyParams {
     'reservedTicket.dateUsed'?: Date;
 }
 export type ICancelResult = UpdateWriteOpResult;
+export type ICreatingReservation<T extends factory.reservationType> = T extends factory.reservationType.BusReservation ? (factory.reservation.busReservation.IReservation) & {
+    _id: string;
+} : T extends factory.reservationType.EventReservation ? (factory.reservation.eventReservation.IReservation) & {
+    _id: string;
+} : never;
 /**
  * 予約リポジトリ
  */
@@ -13,10 +42,6 @@ export declare class MongoRepository {
     private readonly reservationModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.reservation.ISearchConditions<factory.reservationType>): any[];
-    createMany(params: {
-        reservations: factory.assetTransaction.reserve.IObjectSubReservation[];
-        reservationFor: factory.assetTransaction.reserve.IReservationFor;
-    }): Promise<void>;
     /**
      * 汎用予約カウント
      */
@@ -32,26 +57,13 @@ export declare class MongoRepository {
         inclusion?: string[];
         exclusion?: string[];
     }): Promise<factory.reservation.IReservation<T>>;
-    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>;
-    confirmByIdIfNotExist__(params: {
-        reservation: factory.assetTransaction.reserve.IObjectSubReservation;
-        reservationFor: factory.assetTransaction.reserve.IReservationFor;
-        underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
-        broker?: factory.reservation.IBroker<factory.reservationType>;
-        issuedThrough?: factory.assetTransaction.reserve.IIssuedThrough;
-    }): Promise<void>;
     confirmManyIfNotExist(params: {
+        provider: factory.reservation.IProvider;
         subReservation: factory.assetTransaction.reserve.IObjectSubReservation[];
+        issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
         reservationFor: factory.assetTransaction.reserve.IReservationFor;
         underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
         broker?: factory.reservation.IBroker<factory.reservationType>;
-        issuedThrough?: factory.assetTransaction.reserve.IIssuedThrough;
     }): Promise<BulkWriteOpResultObject | void>;
     /**
      * 予約取消
@@ -103,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;
@@ -131,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>>;
 }