@chevre/domain 21.13.0 → 21.15.0-alpha.0

package/example/src/chevre/searchOfferCatalogItems.ts

@@ -11,12 +11,12 @@ mongoose.Model.on('index', (...args) => {
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const eventRepo = new chevre.repository.Event(mongoose.connection);
-    const offerCatalogRepo = new chevre.repository.OfferCatalog(mongoose.connection);
-    const offerCatalogItemRepo = new chevre.repository.OfferCatalogItem(mongoose.connection);
-    const productRepo = new chevre.repository.Product(mongoose.connection);
+    const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
+    const offerCatalogRepo = await chevre.repository.OfferCatalog.createInstance(mongoose.connection);
+    const offerCatalogItemRepo = await chevre.repository.OfferCatalogItem.createInstance(mongoose.connection);
+    const productRepo = await chevre.repository.Product.createInstance(mongoose.connection);
 
-    const result = await chevre.service.offer.event.searchOfferCatalogItems({
+    const result = await (await chevre.service.offer.createService()).event.searchOfferCatalogItems({
         event: {
             id: 'cllkq475u'
         },

package/example/src/chevre/searchOffers.ts

@@ -8,7 +8,7 @@ mongoose.Model.on('index', (...args) => {
 });
 
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
 
     const indexes = await mongoose.connection.db.collection('aggregateOffers')
         .indexes();
@@ -18,7 +18,7 @@ async function main() {
     //     .dropIndexes();
     // console.log('indexes droped');
 
-    const offerRepo = new chevre.repository.Offer(mongoose.connection);
+    const offerRepo = await chevre.repository.Offer.createInstance(mongoose.connection);
 
     const offers = await offerRepo.search({
         limit: 100,

package/example/src/chevre/searchPermissions.ts

@@ -10,13 +10,13 @@ const memberId = 'xxx';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI);
 
-    const memberRepo = new chevre.repository.Member(mongoose.connection);
-    const roleRepo = new chevre.repository.Role(mongoose.connection);
+    const memberRepo = await chevre.repository.Member.createInstance(mongoose.connection);
+    const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
 
     let now: Date;
 
     now = new Date();
-    const searchPermissionsResult = await chevre.service.iam.searchPermissions({
+    const searchPermissionsResult = await (await chevre.service.iam.createService()).searchPermissions({
         project: { id: PROJECT_ID },
         member: {
             id: memberId,

package/example/src/chevre/searchProductOffers.ts

@@ -8,7 +8,7 @@ const PROJECT_ID = String(process.env.PROJECT_ID);
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI);
 
-    const productOfferRepo = new chevre.repository.ProductOffer(mongoose.connection);
+    const productOfferRepo = await chevre.repository.ProductOffer.createInstance(mongoose.connection);
 
     const offers = await productOfferRepo.search({
         project: { id: { $eq: PROJECT_ID } }

package/example/src/chevre/searchSellers.ts

@@ -6,9 +6,9 @@ import { chevre } from '../../../lib/index';
 const project = { id: String(process.env.PROJECT_ID) };
 
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
 
-    const sellerRepo = new chevre.repository.Seller(mongoose.connection);
+    const sellerRepo = await chevre.repository.Seller.createInstance(mongoose.connection);
 
     const sellers = await sellerRepo.search(
         {

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

@@ -4,5 +4,5 @@ export type IMinimizedIndividualEvent<T extends factory.eventType.ScreeningEvent
  * 興行イベントのsuperEventを作成する
  */
 export declare function minimizeSuperEvent(params: {
-    superEventFromDB: factory.event.screeningEventSeries.IEvent;
+    superEventFromDB: Omit<factory.event.screeningEventSeries.IEvent, 'offers'>;
 }): factory.event.screeningEvent.ISuperEvent;

package/lib/chevre/factory/event.js

@@ -6,10 +6,7 @@ const factory = require("../factory");
  * 興行イベントのsuperEventを作成する
  */
 function minimizeSuperEvent(params) {
-    const workPerformed = Object.assign(Object.assign(Object.assign(Object.assign({ 
-        // 不要なので廃止(2022-12-19~)
-        // project: { typeOf: chevre.factory.organizationType.Project, id: params.project.id },
-        typeOf: factory.creativeWorkType.Movie, identifier: String(params.superEventFromDB.workPerformed.identifier) }, (typeof params.superEventFromDB.workPerformed.id === 'string')
+    const workPerformed = Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: factory.creativeWorkType.Movie, identifier: String(params.superEventFromDB.workPerformed.identifier) }, (typeof params.superEventFromDB.workPerformed.id === 'string')
         ? { id: params.superEventFromDB.workPerformed.id }
         : undefined), (params.superEventFromDB.workPerformed.name !== undefined)
         ? { name: params.superEventFromDB.workPerformed.name }
@@ -18,10 +15,7 @@ function minimizeSuperEvent(params) {
         : undefined), (typeof params.superEventFromDB.workPerformed.contentRating === 'string')
         ? { contentRating: params.superEventFromDB.workPerformed.contentRating }
         : undefined);
-    const location = Object.assign(Object.assign({ 
-        // 不要なので廃止(2022-12-19~)
-        // project: { typeOf: chevre.factory.organizationType.Project, id: params.project.id },
-        typeOf: factory.placeType.MovieTheater, id: params.superEventFromDB.location.id, branchCode: params.superEventFromDB.location.branchCode }, (params.superEventFromDB.location.name !== undefined)
+    const location = Object.assign(Object.assign({ typeOf: factory.placeType.MovieTheater, id: params.superEventFromDB.location.id, branchCode: params.superEventFromDB.location.branchCode }, (params.superEventFromDB.location.name !== undefined)
         ? { name: params.superEventFromDB.location.name }
         : undefined), (typeof params.superEventFromDB.location.kanaName === 'string')
         ? { kanaName: params.superEventFromDB.location.kanaName }

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

@@ -74,31 +74,16 @@ interface IStatus {
     status: factory.eventStatusType;
     aggregation: IAggregationByStatus;
 }
-export interface IAggregateEvent {
+interface IAggregateEvent {
     statuses: IStatus[];
 }
-type IKeyOfProjection<T extends factory.eventType> = keyof factory.event.IEvent<T> & '_id';
+type IKeyOfProjection<T extends factory.eventType> = keyof factory.event.IEvent<T> | '_id' | '__v' | 'createdAt' | 'updatedAt';
 type IProjection<T extends factory.eventType> = {
     [key in IKeyOfProjection<T>]?: 0 | 1;
 };
 export import IMinimizedIndividualEvent = EventFactory.IMinimizedIndividualEvent;
-export declare const PROJECTION_MINIMIZED_EVENT: {
-    project: number;
-    organizer: number;
-    _id: number;
-    typeOf: number;
-    additionalProperty: number;
-    name: number;
-    doorTime: number;
-    endDate: number;
-    eventStatus: number;
-    location: number;
-    startDate: number;
-    superEvent: number;
-    offers: number;
-    coaInfo: number;
-    identifier: number;
-};
+export declare const keyOfMinimizedScreeningEvent: IKeyOfProjection<factory.eventType.ScreeningEvent>[];
+export declare const keyOfMinimizedEvent: IKeyOfProjection<factory.eventType.Event>[];
 /**
  * イベントリポジトリ
  */
@@ -166,7 +151,7 @@ export declare class MongoRepository {
     /**
      * イベントを検索する
      */
-    search<T extends factory.eventType>(params: ISearchConditions<T>, projection?: IProjection<T>): Promise<factory.event.IEvent<T>[]>;
+    search<T extends factory.eventType>(params: ISearchConditions<T>, inclusion: IKeyOfProjection<T>[], exclusion: IKeyOfProjection<T>[]): Promise<factory.event.IEvent<T>[]>;
     searchIds<T extends factory.eventType>(params: ISearchConditions<T>): Promise<string[]>;
     findMinimizedIndividualEventById<T extends factory.eventType.ScreeningEvent | factory.eventType.Event>(params: {
         id: string;

package/lib/chevre/repo/event.js

@@ -20,13 +20,21 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MongoRepository = exports.PROJECTION_MINIMIZED_EVENT = void 0;
+exports.MongoRepository = exports.keyOfMinimizedEvent = exports.keyOfMinimizedScreeningEvent = void 0;
 const factory = require("../factory");
 const EventFactory = require("../factory/event");
 const event_1 = require("./mongoose/schemas/event");
 const errorHandler_1 = require("../errorHandler");
 const settings_1 = require("../settings");
-exports.PROJECTION_MINIMIZED_EVENT = {
+exports.keyOfMinimizedScreeningEvent = [
+    'project', 'organizer', '_id', 'typeOf', 'additionalProperty', 'name',
+    'doorTime', 'endDate', 'eventStatus', 'location', 'startDate', 'superEvent', 'offers', 'coaInfo', 'identifier'
+];
+exports.keyOfMinimizedEvent = [
+    'project', 'organizer', '_id', 'typeOf', 'additionalProperty', 'name',
+    'doorTime', 'endDate', 'eventStatus', 'location', 'startDate', 'offers', 'identifier'
+];
+const PROJECTION_MINIMIZED_EVENT = {
     project: 1,
     organizer: 1,
     _id: 1,
@@ -735,32 +743,48 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    // public async count<T extends factory.eventType>(
-    //     params: ISearchConditions<T>
-    // ): Promise<number> {
-    //     const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-    //     return this.eventModel.countDocuments(
-    //         { $and: conditions }
-    //     )
-    //         .setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
-    //         .exec();
-    // }
     /**
      * イベントを検索する
      */
-    search(params, projection) {
+    search(params, 
+    // projection?: IProjection<T>
+    inclusion, exclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            const positiveProjectionExists = (projection !== undefined && projection !== null)
-                ? Object.values(projection)
-                    .some((value) => value !== 0)
-                : false;
-            const query = this.eventModel.find({ $and: conditions }, 
+            let projection = {};
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(exclusion) && exclusion.length > 0) {
+                    exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
+            // const positiveProjectionExists: boolean = (projection !== undefined && projection !== null)
+            //     ? Object.values(projection)
+            //         .some((value) => value !== 0)
+            //     : false;
+            const query = this.eventModel.find({ $and: conditions }, projection
             // :1対応(2023-01-25~)
-            (positiveProjectionExists)
-                ? projection
-                : Object.assign(Object.assign({}, projection), { __v: 0, createdAt: 0, updatedAt: 0 }));
+            // (positiveProjectionExists)
+            //     ? projection
+            //     : {
+            //         ...projection,
+            //         __v: 0,
+            //         createdAt: 0,
+            //         updatedAt: 0
+            //     }
+            );
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
                 query.limit(params.limit)
@@ -792,42 +816,9 @@ class MongoRepository {
                 .exec();
         });
     }
-    // searchに置き換え(2023-07-13~)
-    // public async findById<T extends factory.eventType>(
-    //     params: {
-    //         project: { id: string };
-    //         id: string;
-    //     },
-    //     projection?: IProjection
-    // ): Promise<factory.event.IEvent<T>> {
-    //     const positiveProjectionExists: boolean = (projection !== undefined && projection !== null)
-    //         ? Object.values(projection)
-    //             .some((value) => value !== 0)
-    //         : false;
-    //     const doc = await this.eventModel.findOne(
-    //         {
-    //             _id: params.id,
-    //             'project.id': { $eq: params.project.id }
-    //         },
-    //         // :1対応(2023-01-25~)
-    //         (positiveProjectionExists)
-    //             ? projection
-    //             : {
-    //                 ...projection,
-    //                 __v: 0,
-    //                 createdAt: 0,
-    //                 updatedAt: 0
-    //             }
-    //     )
-    //         .exec();
-    //     if (doc === null) {
-    //         throw new factory.errors.NotFound(this.eventModel.modelName);
-    //     }
-    //     return doc.toObject();
-    // }
     findMinimizedIndividualEventById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.eventModel.findOne({ _id: params.id }, exports.PROJECTION_MINIMIZED_EVENT)
+            const doc = yield this.eventModel.findOne({ _id: params.id }, PROJECTION_MINIMIZED_EVENT)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.eventModel.modelName);
@@ -858,7 +849,7 @@ class MongoRepository {
                 typeOf: factory.eventType.ScreeningEventSeries,
                 id: { $eq: params.superEvent.id },
                 project: { id: { $eq: params.project.id } }
-            });
+            }, [], ['offers']);
             const superEventFromDB = superEvents.shift();
             if (superEventFromDB === undefined) {
                 throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);

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

@@ -54,11 +54,6 @@ export declare class MongoRepository {
             id: string;
         };
     }): Promise<void>;
-    deleteUnnecessaryMovieTicketTypeChargePriceSpecs(params: {
-        project?: {
-            id?: string;
-        };
-    }): Promise<import("mongodb").DeleteResult>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
     reIndex(): Promise<import("bson").Document>;
 }

package/lib/chevre/repo/priceSpecification.js

@@ -240,15 +240,6 @@ class MongoRepository {
                 .exec();
         });
     }
-    deleteUnnecessaryMovieTicketTypeChargePriceSpecs(params) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.priceSpecificationModel.deleteMany(Object.assign({ typeOf: { $eq: factory.priceSpecificationType.MovieTicketTypeChargeSpecification }, price: { $eq: 0 } }, (typeof ((_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === 'string')
-                ? { 'project.id': { $eq: params.project.id } }
-                : undefined))
-                .exec();
-        });
-    }
     getCursor(conditions, projection) {
         return this.priceSpecificationModel.find(conditions, projection)
             .sort({ price: factory.sortType.Ascending })

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

@@ -83,7 +83,6 @@ export interface ISearchResult {
  */
 export declare class StockHolderRepository {
     static KEY_PREFIX_NEW: string;
-    static KEY_PREFIX: string;
     private readonly redisClient;
     constructor(redisClient: RedisClientType, __: Connection);
     private static offer2field;
@@ -104,9 +103,6 @@ export declare class StockHolderRepository {
      * 座席ロックを解除する
      */
     unlock(params: IUnlockKey): Promise<void>;
-    /**
-     * 空席でない座席を検索する
-     */
     /**
      * 空席でない座席をカウントする
      */
@@ -130,11 +126,4 @@ export declare class StockHolderRepository {
         hasTicketedSeat: boolean;
         offers: IOffer[];
     }): Promise<IGetHolderResult[]>;
-    /**
-     * 汎用的な検索(mongooseのみ対応)
-     */
-    /**
-     * 汎用的な集計(mongooseのみ対応)
-     */
-    private checkIfConflicted;
 }