@chevre/domain 28.0.0-alpha.4 → 28.0.0-alpha.5

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

@@ -170,9 +170,6 @@ export declare class AdminEventRepo {
         };
     }): Promise<mongo.DeleteResult>;
     deleteManyEventsEndedByProject(params: {
-        typeOf: {
-            $in: factory.eventType.ScreeningEvent[];
-        };
         project: {
             id: string;
         };
@@ -181,9 +178,6 @@ export declare class AdminEventRepo {
         };
     }): Promise<mongo.DeleteResult>;
     deleteManyEventsEnded(params: {
-        typeOf: {
-            $eq: factory.eventType.ScreeningEvent;
-        };
         endDate: {
             $lte: Date;
         };

package/lib/chevre/repo/adminEvent.js

@@ -155,8 +155,7 @@ class AdminEventRepo {
         }
         const doc = await this.eventModel.findOneAndUpdate({
             _id: { $eq: params.id },
-            'project.id': { $eq: params.project.id },
-            typeOf: { $eq: typeOf }
+            'project.id': { $eq: params.project.id }
         }, {
             $set: updateFields
         }, { upsert: false, new: false, projection: { _id: 1 } })
@@ -187,8 +186,7 @@ class AdminEventRepo {
         }
         try {
             doc = await this.eventModel.findOneAndUpdate({
-                _id: { $eq: params.id },
-                typeOf: { $eq: typeOf }
+                _id: { $eq: params.id }
             }, {
                 // 編集のためのみのメソッドになったので、setOnInsertは廃止(2025-10-27~)
                 // 上書き禁止属性を除外(2022-08-24~)
@@ -231,8 +229,7 @@ class AdminEventRepo {
                     bulkWriteOps.push({
                         updateOne: {
                             filter: {
-                                _id: p.id,
-                                typeOf: p.attributes.typeOf
+                                _id: p.id
                             },
                             update: {
                                 $setOnInsert: {
@@ -279,7 +276,6 @@ class AdminEventRepo {
     async syncScreeningEventSeries2screeningEvents(params) {
         const superEvent = EventFactory.minimizeSuperEvent({ superEventFromDB: params.superEventFromDB });
         await this.eventModel.updateMany({
-            typeOf: { $eq: factory_1.factory.eventType.ScreeningEvent },
             'project.id': { $eq: params.project.id },
             'superEvent.id': { $exists: true, $eq: params.superEventFromDB.id },
             startDate: { $gte: params.startDate.$gte }
@@ -338,7 +334,6 @@ class AdminEventRepo {
     }
     async deleteManyEventsEndedByProject(params) {
         return this.eventModel.deleteMany({
-            typeOf: { $in: params.typeOf.$in },
             'project.id': { $eq: params.project.id },
             endDate: { $lte: params.endDate.$lte }
         })
@@ -346,7 +341,6 @@ class AdminEventRepo {
     }
     async deleteManyEventsEnded(params) {
         return this.eventModel.deleteMany({
-            typeOf: { $eq: params.typeOf.$eq },
             endDate: { $lte: params.endDate.$lte }
         })
             .exec();

package/lib/chevre/repo/aggregateEvent.js

@@ -22,7 +22,6 @@ class AggregateEventRepo {
                     $gte: params.startFrom,
                     $lte: params.startThrough
                 },
-                typeOf: { $eq: params.typeOf },
                 eventStatus: { $eq: eventStatus },
                 ...(typeof params.project?.id?.$ne === 'string')
                     ? { 'project.id': { $ne: params.project.id.$ne } }

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

@@ -1,7 +1,7 @@
 import { Connection, FilterQuery } from 'mongoose';
 import { factory } from '../factory';
 import * as EventFactory from '../factory/event';
-export type ISearchConditions = factory.event.screeningEvent.ISearchConditions;
+export type ISearchConditions = Pick<factory.event.screeningEvent.ISearchConditions, 'additionalProperty' | 'endFrom' | 'endThrough' | 'eventStatuses' | 'id' | 'identifiers' | 'inSessionFrom' | 'inSessionThrough' | 'limit' | 'location' | 'offers' | 'organizer' | 'page' | 'project' | 'sort' | 'startFrom' | 'startThrough' | 'superEvent'> & {};
 export import IMinimizedIndividualEvent = EventFactory.IMinimizedIndividualEvent;
 type IKeyOfProjection = Exclude<keyof factory.event.screeningEvent.IEvent, 'id'> | 'aggregateOffer' | 'superEvent.location.id' | 'offers.itemOffered' | 'offers.itemOffered.id' | 'offers.typeOf';
 type IKeyOfProjection4publicFields = Exclude<keyof factory.event.screeningEvent.IEvent, 'id' | 'offers'>;
@@ -60,7 +60,7 @@ export declare class EventRepo {
     /**
      * COAイベントキャンセル時に使用
      */
-    searchEventIds(params: Pick<ISearchConditions, 'project' | 'typeOf' | 'superEvent' | 'startFrom' | 'startThrough'>): Promise<string[]>;
+    searchEventIds(params: Pick<ISearchConditions, 'project' | 'superEvent' | 'startFrom' | 'startThrough'>): Promise<string[]>;
     /**
      * 特定イベントから指定フィールドのみ取得する
      * イベント IDは必ず返ります

package/lib/chevre/repo/event.js

@@ -22,18 +22,18 @@ class EventRepo {
     }
     static CREATE_MONGO_CONDITIONS(conditions) {
         const andConditions = [];
-        const typeOfEq = conditions.typeOf;
-        if (typeof typeOfEq === 'string') {
-            andConditions.push({ typeOf: { $eq: typeOfEq } });
-        }
-        const typeOfIn = conditions.typeOfIn;
-        if (Array.isArray(typeOfIn)) {
-            andConditions.push({ typeOf: { $in: typeOfIn } });
-        }
-        // typeOf条件必須検証(2023-07-13~)
-        if (typeof typeOfEq !== 'string' && !Array.isArray(typeOfIn)) {
-            throw new factory_1.factory.errors.ArgumentNull('typeOf');
-        }
+        // const typeOfEq = conditions.typeOf;
+        // if (typeof typeOfEq === 'string') {
+        //     andConditions.push({ typeOf: { $eq: typeOfEq } });
+        // }
+        // const typeOfIn = conditions.typeOfIn;
+        // if (Array.isArray(typeOfIn)) {
+        //     andConditions.push({ typeOf: { $in: typeOfIn } });
+        // }
+        // // typeOf条件必須検証(2023-07-13~)
+        // if (typeof typeOfEq !== 'string' && !Array.isArray(typeOfIn)) {
+        //     throw new factory.errors.ArgumentNull('typeOf');
+        // }
         const projectIdEq = conditions.project?.id?.$eq;
         if (typeof projectIdEq === 'string') {
             andConditions.push({ 'project.id': { $eq: projectIdEq } });
@@ -113,110 +113,72 @@ class EventRepo {
                 }
             });
         }
-        let params;
-        switch (conditions.typeOf) {
-            case factory_1.factory.eventType.ScreeningEvent: {
-                params = conditions;
-                // /* istanbul ignore else */
-                // if (typeof params.name === 'string' && params.name.length > 0) {
-                //     andConditions.push({
-                //         $or: [
-                //             {
-                //                 'name.ja': {
-                //                     $exists: true,
-                //                     $regex: new RegExp(params.name)
-                //                 }
-                //             },
-                //             {
-                //                 'name.en': {
-                //                     $exists: true,
-                //                     $regex: new RegExp(params.name)
-                //                 }
-                //             }
-                //         ]
-                //     });
-                // }
-                /* istanbul ignore else */
-                const superEventLocationIdEq = params.superEvent?.location?.id?.$eq;
-                if (typeof superEventLocationIdEq === 'string') {
-                    andConditions.push({
-                        'superEvent.location.id': {
-                            $exists: true,
-                            $eq: superEventLocationIdEq
-                        }
-                    });
+        /* istanbul ignore else */
+        const superEventLocationIdEq = conditions.superEvent?.location?.id?.$eq;
+        if (typeof superEventLocationIdEq === 'string') {
+            andConditions.push({
+                'superEvent.location.id': {
+                    $exists: true,
+                    $eq: superEventLocationIdEq
                 }
-                /* istanbul ignore else */
-                if (params.superEvent !== undefined) {
-                    /* istanbul ignore else */
-                    if (Array.isArray(params.superEvent.ids)) {
-                        andConditions.push({
-                            'superEvent.id': {
-                                $exists: true,
-                                $in: params.superEvent.ids
-                            }
-                        });
+            });
+        }
+        /* istanbul ignore else */
+        if (conditions.superEvent !== undefined) {
+            /* istanbul ignore else */
+            if (Array.isArray(conditions.superEvent.ids)) {
+                andConditions.push({
+                    'superEvent.id': {
+                        $exists: true,
+                        $in: conditions.superEvent.ids
                     }
-                    /* istanbul ignore else */
-                    if (Array.isArray(params.superEvent.locationBranchCodes)) {
-                        andConditions.push({
-                            'superEvent.location.branchCode': {
-                                $exists: true,
-                                $in: params.superEvent.locationBranchCodes
-                            }
-                        });
+                });
+            }
+            /* istanbul ignore else */
+            if (Array.isArray(conditions.superEvent.locationBranchCodes)) {
+                andConditions.push({
+                    'superEvent.location.branchCode': {
+                        $exists: true,
+                        $in: conditions.superEvent.locationBranchCodes
                     }
-                    /* istanbul ignore else */
-                    if (Array.isArray(params.superEvent.workPerformedIdentifiers)) {
-                        andConditions.push({
-                            'superEvent.workPerformed.identifier': {
-                                $exists: true,
-                                $in: params.superEvent.workPerformedIdentifiers
-                            }
-                        });
+                });
+            }
+            /* istanbul ignore else */
+            if (Array.isArray(conditions.superEvent.workPerformedIdentifiers)) {
+                andConditions.push({
+                    'superEvent.workPerformed.identifier': {
+                        $exists: true,
+                        $in: conditions.superEvent.workPerformedIdentifiers
                     }
+                });
+            }
+        }
+        const itemOfferedIdIn = conditions.offers?.itemOffered?.id?.$in;
+        if (Array.isArray(itemOfferedIdIn)) {
+            andConditions.push({
+                'offers.itemOffered.id': {
+                    $exists: true,
+                    $in: itemOfferedIdIn
                 }
-                const itemOfferedIdIn = params.offers?.itemOffered?.id?.$in;
-                if (Array.isArray(itemOfferedIdIn)) {
-                    andConditions.push({
-                        'offers.itemOffered.id': {
-                            $exists: true,
-                            $in: itemOfferedIdIn
-                        }
-                    });
-                }
-                const itemOfferedTicketedSeatTypeOfIn = params.offers?.itemOffered?.serviceOutput?.reservedTicket?.ticketedSeat?.typeOfs;
-                if (Array.isArray(itemOfferedTicketedSeatTypeOfIn)) {
-                    andConditions.push({
-                        'offers.itemOffered.serviceOutput.reservedTicket.ticketedSeat.typeOf': {
-                            $exists: true,
-                            $in: itemOfferedTicketedSeatTypeOfIn
-                        }
-                    });
+            });
+        }
+        const itemOfferedTicketedSeatTypeOfIn = conditions.offers?.itemOffered?.serviceOutput?.reservedTicket?.ticketedSeat?.typeOfs;
+        if (Array.isArray(itemOfferedTicketedSeatTypeOfIn)) {
+            andConditions.push({
+                'offers.itemOffered.serviceOutput.reservedTicket.ticketedSeat.typeOf': {
+                    $exists: true,
+                    $in: itemOfferedTicketedSeatTypeOfIn
                 }
-                // const itemOfferedServiceTypeIdIn = params.offers?.itemOffered?.serviceType?.ids;
-                // if (Array.isArray(itemOfferedServiceTypeIdIn)) {
-                //     andConditions.push({
-                //         'offers.itemOffered.serviceType.id': {
-                //             $exists: true,
-                //             $in: itemOfferedServiceTypeIdIn
-                //         }
-                //     });
-                // }
-                const sellerMakesOfferElemMatch = params.offers?.seller?.makesOffer?.$elemMatch;
-                if (typeof sellerMakesOfferElemMatch?.['availableAtOrFrom.id']?.$eq === 'string') {
-                    andConditions.push({
-                        'offers.seller.makesOffer': {
-                            $exists: true,
-                            $elemMatch: sellerMakesOfferElemMatch
-                        }
-                    });
+            });
+        }
+        const sellerMakesOfferElemMatch = conditions.offers?.seller?.makesOffer?.$elemMatch;
+        if (typeof sellerMakesOfferElemMatch?.['availableAtOrFrom.id']?.$eq === 'string') {
+            andConditions.push({
+                'offers.seller.makesOffer': {
+                    $exists: true,
+                    $elemMatch: sellerMakesOfferElemMatch
                 }
-                break;
-            }
-            case factory_1.factory.eventType.ScreeningEventSeries: // eslint-disable-line @typescript-eslint/no-explicit-any
-                throw new factory_1.factory.errors.Internal('typeOf: ScreeningEventSeries discontinued');
-            default:
+            });
         }
         return andConditions;
     }
@@ -339,7 +301,6 @@ class EventRepo {
         const doc = await this.eventModel.findOne({
             _id: { $eq: params.id.$eq },
             'project.id': { $eq: params.project.id.$eq },
-            typeOf: { $in: [factory_1.factory.eventType.ScreeningEvent] },
             ...(typeof params.organizer?.id.$eq === 'string')
                 ? { 'organizer.id': { $exists: true, $eq: params.organizer.id.$eq } }
                 : undefined

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

@@ -4,7 +4,6 @@ exports.modelName = exports.indexes = void 0;
 exports.createSchema = createSchema;
 const mongoose_1 = require("mongoose");
 const writeConcern_1 = require("../writeConcern");
-const factory_1 = require("../../../factory");
 const settings_1 = require("../../../settings");
 const modelName = 'Transaction';
 exports.modelName = modelName;
@@ -96,21 +95,21 @@ const indexes = [
             }
         }
     ],
-    [
-        // 注文取引のobject.orderNumberも発行されている場合ユニークなはず(2026-02-21~)
-        {
-            typeOf: 1,
-            'object.orderNumber': 1
-        },
-        {
-            name: 'uniquePlacingOrderNumber',
-            unique: true,
-            partialFilterExpression: {
-                typeOf: factory_1.factory.transactionType.PlaceOrder,
-                'object.orderNumber': { $exists: true }
-            }
-        }
-    ],
+    // [
+    //     // 注文取引のobject.orderNumberも発行されている場合ユニークなはず(2026-02-21~)
+    //     {
+    //         typeOf: 1,
+    //         'object.orderNumber': 1
+    //     },
+    //     {
+    //         name: 'uniquePlacingOrderNumber',
+    //         unique: true,
+    //         partialFilterExpression: {
+    //             typeOf: factory.transactionType.PlaceOrder,
+    //             'object.orderNumber': { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { 'agent.typeOf': 1, startDate: -1 },
         {
@@ -170,15 +169,6 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'tasksExportAction.actionStatus': 1, startDate: -1 },
-        {
-            name: 'searchByTasksExportActionActionStatus',
-            partialFilterExpression: {
-                'tasksExportAction.actionStatus': { $exists: true }
-            }
-        }
-    ],
     // typeOf: ReturnOrder廃止につき以下廃止(2026-09-08~)
     // [
     //     { 'object.order.orderNumber': 1, startDate: -1 },
@@ -224,6 +214,15 @@ const indexes = [
     //         }
     //     }
     // ],
+    // [
+    //     { 'tasksExportAction.actionStatus': 1, startDate: -1 },
+    //     {
+    //         name: 'searchByTasksExportActionActionStatus',
+    //         partialFilterExpression: {
+    //             'tasksExportAction.actionStatus': { $exists: true }
+    //         }
+    //     }
+    // ],
 ];
 exports.indexes = indexes;
 /**

package/lib/chevre/repo/transaction/placeOrder.d.ts

@@ -17,7 +17,7 @@ export type IPlaceOrder = Pick<factory.transaction.placeOrder.ITransaction, IKey
 };
 type IStartedPlaceOrderFields = 'expires' | 'id' | 'startDate' | 'status';
 export type IStartedPlaceOrder = Pick<factory.transaction.placeOrder.ITransaction, IStartedPlaceOrderFields>;
-type IFindParams = Pick<factory.transaction.placeOrder.ISearchConditions, 'agent' | 'ids' | 'limit' | 'object' | 'page' | 'project' | 'seller' | 'sort' | 'startFrom' | 'startThrough' | 'status' | 'statuses' | 'tasksExportAction'> & {};
+type IFindParams = Pick<factory.transaction.placeOrder.ISearchConditions, 'agent' | 'ids' | 'limit' | 'object' | 'page' | 'project' | 'seller' | 'sort' | 'startFrom' | 'startThrough' | 'status' | 'statuses'> & {};
 /**
  * 注文取引リポジトリ
  */

package/lib/chevre/repo/transaction/placeOrder.js

@@ -110,14 +110,15 @@ class PlaceOrderRepo {
                 });
             }
         }
-        const tasksExportActionStatusIn = params.tasksExportAction?.actionStatus?.$in;
-        if (Array.isArray(tasksExportActionStatusIn)) {
-            andConditions.push({ 'tasksExportAction.actionStatus': { $exists: true, $in: tasksExportActionStatusIn } });
-        }
-        const tasksExportActionStatusEq = params.tasksExportAction?.actionStatus?.$eq;
-        if (typeof tasksExportActionStatusEq === 'string') {
-            andConditions.push({ 'tasksExportAction.actionStatus': { $exists: true, $eq: tasksExportActionStatusEq } });
-        }
+        // discontinue(2026-09-11~)
+        // const tasksExportActionStatusIn = params.tasksExportAction?.actionStatus?.$in;
+        // if (Array.isArray(tasksExportActionStatusIn)) {
+        //     andConditions.push({ 'tasksExportAction.actionStatus': { $exists: true, $in: tasksExportActionStatusIn } });
+        // }
+        // const tasksExportActionStatusEq = params.tasksExportAction?.actionStatus?.$eq;
+        // if (typeof tasksExportActionStatusEq === 'string') {
+        //     andConditions.push({ 'tasksExportAction.actionStatus': { $exists: true, $eq: tasksExportActionStatusEq } });
+        // }
         const sellerIdIn = params.seller?.ids;
         if (Array.isArray(sellerIdIn)) {
             andConditions.push({ 'seller.id': { $exists: true, $in: sellerIdIn } });

package/lib/chevre/service/aggregation/event/aggregateOffers.js

@@ -22,8 +22,7 @@ function aggregateOffers(params) {
         const eventCapacity = (await repos.event.projectEventFields({
             limit: 1,
             page: 1,
-            id: { $eq: params.id },
-            typeOf: params.typeOf
+            id: { $eq: params.id }
         }, ['maximumAttendeeCapacity', 'remainingAttendeeCapacity'])).shift();
         debug('processing aggregateOffersByEvent...', eventCapacity);
         await aggregateOffersByEvent({

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -53,7 +53,6 @@ function aggregateScreeningEvent(params) {
                         limit: 100,
                         page: 1,
                         project: { id: { $eq: event.project.id } },
-                        typeOf: event.typeOf,
                         eventStatuses: [factory_1.factory.eventStatusType.EventScheduled],
                         startFrom: startFrom,
                         startThrough: startThrough,

package/lib/chevre/service/assetTransaction/pay/start/preStart/validateAcceptedPaymentMethodIfNeeded.js

@@ -81,8 +81,7 @@ function validateAcceptedPaymentMethodIfNeeded(params
             const eventSeriesIds = (await repos.event.projectEventFields({
                 limit: checkingEventIds.length,
                 page: 1,
-                id: { $in: checkingEventIds },
-                typeOf: factory_1.factory.eventType.ScreeningEvent
+                id: { $in: checkingEventIds }
             }, ['superEvent'])).map((event) => event.superEvent.id);
             if (eventSeriesIds.length !== checkingEventIds.length) {
                 throw new factory_1.factory.errors.NotFound(factory_1.factory.eventType.ScreeningEvent);

package/lib/chevre/service/event.js

@@ -153,7 +153,6 @@ function cancelDeletedEvents(params) {
         // COAから削除されたイベントをキャンセル済ステータスへ変更
         const ids = await repos.event.searchEventIds({
             project: { id: { $eq: params.project.id } },
-            typeOf: factory_1.factory.eventType.ScreeningEvent,
             superEvent: {
                 locationBranchCodes: [params.locationBranchCode]
             },

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.js

@@ -12,7 +12,6 @@ function findCOAInfo(params) {
             project: { id: { $eq: params.project.id } },
             limit: 1,
             page: 1,
-            typeOf: factory_1.factory.eventType.ScreeningEvent,
             id: { $eq: params.id }
         }, ['coaInfo'])).shift();
         if (event === undefined) {

package/lib/chevre/service/offer/onEventChanged.js

@@ -101,8 +101,7 @@ function createInformTasks(params, setting) {
         const informEvents = setting?.onResourceUpdated?.informResource;
         if (params.typeOf === factory_1.factory.eventType.ScreeningEvent) {
             const screeningEvents4inform = await repos.event.projectEventFields({
-                id: { $in: params.ids },
-                typeOf: params.typeOf
+                id: { $in: params.ids }
             }, [
                 'project', 'organizer', 'typeOf', 'name', 'doorTime', 'endDate',
                 'eventStatus', 'location', 'startDate', 'superEvent', 'offers', 'additionalProperty', 'identifier'
@@ -296,8 +295,7 @@ function syncEventEndDate2pendingReservations(params) {
             const events = await repos.event.projectEventFields({
                 limit: 1,
                 page: 1,
-                id: { $eq: eventId },
-                typeOf: params.typeOf
+                id: { $eq: eventId }
             }, ['endDate']);
             const endDate = events.shift()?.endDate;
             if (endDate instanceof Date) {

package/lib/chevre/service/offer.js

@@ -169,8 +169,7 @@ function findEventSeatOffersBySection(params) {
             page: 1,
             project: { id: { $eq: projectId } },
             organizer: { id: { $eq: sellerId } },
-            id: { $eq: eventId },
-            typeOf: factory_1.factory.eventType.ScreeningEvent
+            id: { $eq: eventId }
         }, ['startDate', 'offers.itemOffered', 'location', 'superEvent'])).shift();
         if (event === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.eventType.ScreeningEvent);

package/lib/chevre/service/transaction/returnOrder/preStart.js

@@ -36,8 +36,7 @@ function preStart(params) {
         let events = [];
         if (eventIds.length > 0) {
             events = await repos.event.projectEventFields({
-                id: { $in: eventIds },
-                typeOf: factory_1.factory.eventType.ScreeningEvent
+                id: { $in: eventIds }
             }, ['startDate']);
         }
         let returnPolicies = [];

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "11.0.0-alpha.1",
+    "@chevre/factory": "11.0.0-alpha.2",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "28.0.0-alpha.4"
+  "version": "28.0.0-alpha.5"
 }