@chevre/domain 23.2.0-alpha.57 → 23.2.0-alpha.59

package/example/src/chevre/event/importEventsFromCOAByTitle.ts

@@ -87,7 +87,7 @@ async function main() {
         [
             'project', 'typeOf', 'eventStatus', 'identifier',
             'name', 'kanaName', 'alternativeHeadline', 'location',
-            'organizer', 'videoFormat', 'soundFormat', 'workPerformed',
+            'organizer', 'soundFormat', 'workPerformed',
             'duration', 'endDate', 'startDate', 'coaInfo',
             'offers', 'additionalProperty'
         ]

package/example/src/chevre/eventSeries/upsertScreeningEventSeriesByVersion.ts

@@ -17,7 +17,6 @@ async function main() {
             {
                 $set: {
                     eventStatus: chevre.factory.eventStatusType.EventScheduled,
-                    videoFormat: [],
                     soundFormat: [],
                     subEvent: {
                         typeOf: chevre.factory.eventType.ScreeningEvent,

package/example/src/chevre/settings/addOrderNumberSetting.ts

@@ -24,10 +24,14 @@ async function main() {
             { project: { id: { $eq: '*' } } },
             {
                 orderNumber: {
-                    validFrom: moment('2027-02-11T15:00:00Z')
+                    validFrom: moment('2026-02-10T05:00:00Z')
                         .toDate(),
                     fpeSecret: FPE_SECRET,
-                    version: 'A'
+                    version: 'A',
+                    versioningForceProjects: [
+                        'TTT',
+                        'SSK'
+                    ]
                 }
             }
         );

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

@@ -4,5 +4,5 @@ export type IMinimizedIndividualEvent = Pick<factory.event.screeningEvent.IEvent
  * 興行イベントのsuperEventを作成する
  */
 export declare function minimizeSuperEvent(params: {
-    superEventFromDB: Pick<factory.eventSeries.IEvent, 'additionalProperty' | 'alternativeHeadline' | 'description' | 'dubLanguage' | 'endDate' | 'headline' | 'id' | 'kanaName' | 'location' | 'name' | 'soundFormat' | 'startDate' | 'subtitleLanguage' | 'typeOf' | 'videoFormat' | 'workPerformed'>;
+    superEventFromDB: Pick<factory.eventSeries.IEvent, 'additionalProperty' | 'alternativeHeadline' | 'description' | 'dubLanguage' | 'endDate' | 'headline' | 'id' | 'kanaName' | 'location' | 'name' | 'soundFormat' | 'startDate' | 'subtitleLanguage' | 'typeOf' | 'workPerformed'>;
 }): factory.event.screeningEvent.ISuperEvent;

package/lib/chevre/factory/event.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.minimizeSuperEvent = minimizeSuperEvent;
 const factory = require("../factory");
-const USE_DEPRECATED_VIDEO_FORMAT_EVENTS = process.env.USE_DEPRECATED_VIDEO_FORMAT_EVENTS === '1';
 /**
  * 興行イベントのsuperEventを作成する
  */
@@ -24,7 +23,7 @@ function minimizeSuperEvent(params) {
     //     ? { kanaName: params.superEventFromDB.location.kanaName }
     //     : undefined
     );
-    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: factory.eventType.ScreeningEventSeries, id: params.superEventFromDB.id, soundFormat: params.superEventFromDB.soundFormat, workPerformed,
+    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: factory.eventType.ScreeningEventSeries, id: params.superEventFromDB.id, soundFormat: params.superEventFromDB.soundFormat, workPerformed,
         location, kanaName: params.superEventFromDB.kanaName, name: Object.assign(Object.assign({}, (typeof params.superEventFromDB.name.en === 'string') ? { en: params.superEventFromDB.name.en } : undefined), (typeof params.superEventFromDB.name.ja === 'string') ? { ja: params.superEventFromDB.name.ja } : undefined) }, (Array.isArray(params.superEventFromDB.additionalProperty))
         ? { additionalProperty: params.superEventFromDB.additionalProperty }
         : undefined), (params.superEventFromDB.startDate instanceof Date)
@@ -39,10 +38,14 @@ function minimizeSuperEvent(params) {
         ? { dubLanguage: params.superEventFromDB.dubLanguage }
         : undefined), (params.superEventFromDB.subtitleLanguage !== undefined)
         ? { subtitleLanguage: params.superEventFromDB.subtitleLanguage }
-        : undefined), (USE_DEPRECATED_VIDEO_FORMAT_EVENTS)
-        ? {
-            // 現時点で型廃止済だがデータとしては互換性維持(2026-01-15~)
-            videoFormat: params.superEventFromDB.videoFormat
-        }
-        : undefined);
+        : undefined
+    // 完全に廃止(2026-02-10~)
+    // // videoFormatをデータとしても廃止(万が一に備えてUSE_DEPRECATED_VIDEO_FORMAT_EVENTSで再設定可能)(2026-02-04~)
+    // ...(USE_DEPRECATED_VIDEO_FORMAT_EVENTS)
+    //     ? {
+    //         // 現時点で型廃止済だがデータとしては互換性維持(2026-01-15~)
+    //         videoFormat: params.superEventFromDB.videoFormat
+    //     }
+    //     : undefined
+    );
 }

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

@@ -210,7 +210,7 @@ export declare class EventRepo {
         project: {
             id: string;
         };
-        superEventFromDB: Pick<factory.eventSeries.IEvent, 'additionalProperty' | 'alternativeHeadline' | 'description' | 'dubLanguage' | 'endDate' | 'headline' | 'id' | 'kanaName' | 'location' | 'name' | 'soundFormat' | 'startDate' | 'subtitleLanguage' | 'typeOf' | 'videoFormat' | 'workPerformed'>;
+        superEventFromDB: Pick<factory.eventSeries.IEvent, 'additionalProperty' | 'alternativeHeadline' | 'description' | 'dubLanguage' | 'endDate' | 'headline' | 'id' | 'kanaName' | 'location' | 'name' | 'soundFormat' | 'startDate' | 'subtitleLanguage' | 'typeOf' | 'workPerformed'>;
         startDate: {
             $gte: Date;
         };

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

@@ -1,8 +1,8 @@
 import type { BulkWriteResult } from 'mongodb';
-import type { Connection, Document, FilterQuery } from 'mongoose';
+import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 type ISearchConditions = factory.eventSeries.ISearchConditions;
-type IKeyOfProjection = Exclude<keyof factory.eventSeries.IEvent, 'id'>;
+type IKeyOfProjection = Exclude<keyof factory.eventSeries.IEvent, 'id' | 'videoFormat'>;
 type IUnset = {
     [key in keyof factory.eventSeries.IEvent]?: 1;
 };
@@ -13,13 +13,6 @@ export declare class EventSeriesRepo {
     private readonly eventSeriesModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(conditions: ISearchConditions): FilterQuery<factory.eventSeries.IEvent>[];
-    /**
-     * 複数イベントを作成する
-     */
-    createManyEventSeries(params: {
-        attributes: factory.eventSeries.IAttributes[];
-        expectsNoContent: boolean;
-    }): Promise<string[] | void>;
     /**
      * コンテンツ+バージョンをキーにして、なければ作成する(複数対応)
      */
@@ -44,16 +37,6 @@ export declare class EventSeriesRepo {
             id: string;
         }[];
     }>;
-    saveEventSeries(params: {
-        id?: string;
-        attributes: factory.eventSeries.IAttributes;
-        /**
-         * ドキュメント作成時には無視される
-         */
-        $unset?: IUnset;
-    }): Promise<{
-        id: string;
-    }>;
     /**
      * sskts施設コンテンツ保管
      */
@@ -64,7 +47,7 @@ export declare class EventSeriesRepo {
     /**
      * イベントを検索する(inclusion projection)
      */
-    projectEventSeriesFields(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.eventSeries.IEvent[]>;
+    projectEventSeriesFields(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<Omit<factory.eventSeries.IEvent, 'videoFormat'>[]>;
     deleteEventSeriesById(params: {
         project: {
             id: string;
@@ -109,13 +92,13 @@ export declare class EventSeriesRepo {
     }): Promise<{
         maxVersion: string;
     }>;
-    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<Document<unknown, {}, factory.eventSeries.IAttributes & {
+    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, factory.eventSeries.IAttributes & {
         _id: string;
     }> & factory.eventSeries.IAttributes & {
         _id: string;
     } & Required<{
         _id: string;
-    }>, import("mongoose").QueryOptions<Document<unknown, {}, factory.eventSeries.IAttributes & {
+    }>, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, factory.eventSeries.IAttributes & {
         _id: string;
     }> & factory.eventSeries.IAttributes & {
         _id: string;

package/lib/chevre/repo/eventSeries.js

@@ -23,7 +23,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventSeriesRepo = void 0;
 const factory = require("../factory");
 const eventSeries_1 = require("./mongoose/schemas/eventSeries");
-const errorHandler_1 = require("../errorHandler");
+// import { isMongoError, MongoErrorCode } from '../errorHandler';
 const settings_1 = require("../settings");
 /**
  * 施設コンテンツリポジトリ
@@ -224,34 +224,40 @@ class EventSeriesRepo {
         }
         return andConditions;
     }
-    /**
-     * 複数イベントを作成する
-     */
-    createManyEventSeries(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const uniqid = yield Promise.resolve().then(() => require('uniqid'));
-            const insertingDocs = params.attributes.map((p) => {
-                return Object.assign({ _id: uniqid() }, p);
-            });
-            try {
-                yield this.eventSeriesModel.insertMany(insertingDocs, { rawResult: true } // rawResult(2024-08-02~)
-                );
-                // console.dir(insertResult, { depth: null });
-            }
-            catch (error) {
-                if (yield (0, errorHandler_1.isMongoError)(error)) {
-                    if (error.code === errorHandler_1.MongoErrorCode.DuplicateKey) {
-                        throw new factory.errors.AlreadyInUse(factory.eventType.ScreeningEventSeries, ['workPerformed.version']);
-                    }
-                }
-                throw error;
-            }
-            if (params.expectsNoContent) {
-                return;
-            }
-            return insertingDocs.map(({ _id }) => _id);
-        });
-    }
+    // /**
+    //  * 複数イベントを作成する
+    //  */
+    // public async createManyEventSeries(params: {
+    //     attributes: factory.eventSeries.IAttributes[];
+    //     expectsNoContent: boolean;
+    // }): Promise<string[] | void> { // optimize response(only id)(2024-08-02~)
+    //     const uniqid = await import('uniqid');
+    //     const insertingDocs: (factory.eventSeries.IAttributes & { _id: string })[] =
+    //         params.attributes.map((p) => {
+    //             return {
+    //                 _id: uniqid(),
+    //                 ...p
+    //             };
+    //         });
+    //     try {
+    //         await this.eventSeriesModel.insertMany<factory.eventSeries.IAttributes & { _id: string }>(
+    //             insertingDocs,
+    //             { rawResult: true } // rawResult(2024-08-02~)
+    //         );
+    //         // console.dir(insertResult, { depth: null });
+    //     } catch (error) {
+    //         if (await isMongoError(error)) {
+    //             if (error.code === MongoErrorCode.DuplicateKey) {
+    //                 throw new factory.errors.AlreadyInUse(factory.eventType.ScreeningEventSeries, ['workPerformed.version']);
+    //             }
+    //         }
+    //         throw error;
+    //     }
+    //     if (params.expectsNoContent) {
+    //         return;
+    //     }
+    //     return insertingDocs.map(({ _id }) => _id);
+    // }
     /**
      * コンテンツ+バージョンをキーにして、なければ作成する(複数対応)
      */
@@ -374,54 +380,68 @@ class EventSeriesRepo {
             return { modifiedEvents: [] };
         });
     }
-    saveEventSeries(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let savedEventId;
-            let doc;
-            const _a = params.attributes, { identifier, project, typeOf } = _a, updateFields = __rest(_a, ["identifier", "project", "typeOf"]);
-            if (typeof typeOf !== 'string' || typeOf.length === 0) {
-                throw new factory.errors.ArgumentNull('attributes.typeOf');
-            }
-            try {
-                if (params.id === undefined) {
-                    const uniqid = yield Promise.resolve().then(() => require('uniqid'));
-                    const id = uniqid();
-                    doc = yield this.eventSeriesModel.create(Object.assign(Object.assign({}, params.attributes), { _id: id }));
-                    savedEventId = id;
-                }
-                else {
-                    // const upsert: boolean = params.upsert === true;
-                    const upsert = false;
-                    doc = yield this.eventSeriesModel.findOneAndUpdate({
-                        _id: { $eq: params.id },
-                        typeOf: { $eq: typeOf }
-                    }, Object.assign({ 
-                        // 上書き禁止属性を除外(2022-08-24~)
-                        $setOnInsert: Object.assign({ typeOf,
-                            project }, (identifier !== undefined) ? { identifier } : undefined), $set: updateFields }, (params.$unset !== undefined) ? { $unset: params.$unset } : undefined), {
-                        upsert,
-                        new: true,
-                        projection: { _id: 1 }
-                    })
-                        .lean()
-                        .exec();
-                    savedEventId = params.id;
-                }
-            }
-            catch (error) {
-                if (yield (0, errorHandler_1.isMongoError)(error)) {
-                    if (error.code === errorHandler_1.MongoErrorCode.DuplicateKey) {
-                        throw new factory.errors.AlreadyInUse(factory.eventType.ScreeningEventSeries, ['workPerformed.version']);
-                    }
-                }
-                throw error;
-            }
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.eventSeriesModel.modelName);
-            }
-            return { id: savedEventId }; // optimize(2024-07-31~)
-        });
-    }
+    // public async saveEventSeries(params: {
+    //     id?: string;
+    //     attributes: factory.eventSeries.IAttributes;
+    //     /**
+    //      * ドキュメント作成時には無視される
+    //      */
+    //     $unset?: IUnset;
+    //     // upsert?: boolean;
+    // }): Promise<{ id: string }> {
+    //     let savedEventId: string;
+    //     let doc: Document | { _id: string } | null;
+    //     const { identifier, project, typeOf, ...updateFields } = params.attributes;
+    //     if (typeof typeOf !== 'string' || typeOf.length === 0) {
+    //         throw new factory.errors.ArgumentNull('attributes.typeOf');
+    //     }
+    //     try {
+    //         if (params.id === undefined) {
+    //             const uniqid = await import('uniqid');
+    //             const id = uniqid();
+    //             doc = await this.eventSeriesModel.create({ ...params.attributes, _id: id });
+    //             savedEventId = id;
+    //         } else {
+    //             // const upsert: boolean = params.upsert === true;
+    //             const upsert: boolean = false;
+    //             doc = await this.eventSeriesModel.findOneAndUpdate(
+    //                 {
+    //                     _id: { $eq: params.id },
+    //                     typeOf: { $eq: typeOf }
+    //                 },
+    //                 {
+    //                     // 上書き禁止属性を除外(2022-08-24~)
+    //                     $setOnInsert: {
+    //                         typeOf,
+    //                         project,
+    //                         ...(identifier !== undefined) ? { identifier } : undefined
+    //                     },
+    //                     $set: updateFields,
+    //                     ...(params.$unset !== undefined) ? { $unset: params.$unset } : undefined
+    //                 },
+    //                 {
+    //                     upsert,
+    //                     new: true,
+    //                     projection: { _id: 1 }
+    //                 }
+    //             )
+    //                 .lean<{ _id: string }>()
+    //                 .exec();
+    //             savedEventId = params.id;
+    //         }
+    //     } catch (error) {
+    //         if (await isMongoError(error)) {
+    //             if (error.code === MongoErrorCode.DuplicateKey) {
+    //                 throw new factory.errors.AlreadyInUse(factory.eventType.ScreeningEventSeries, ['workPerformed.version']);
+    //             }
+    //         }
+    //         throw error;
+    //     }
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(this.eventSeriesModel.modelName);
+    //     }
+    //     return { id: savedEventId }; // optimize(2024-07-31~)
+    // }
     /**
      * sskts施設コンテンツ保管
      */

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

@@ -8,32 +8,10 @@ const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
 const modelName = 'EventSeries';
 exports.modelName = modelName;
-const schemaDefinition = {
-    project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
-    organizer: { type: mongoose_1.SchemaTypes.Mixed, required: true },
-    _id: String,
-    typeOf: { type: String, required: true },
-    identifier: String,
-    name: mongoose_1.SchemaTypes.Mixed,
-    additionalProperty: mongoose_1.SchemaTypes.Mixed,
-    alternativeHeadline: mongoose_1.SchemaTypes.Mixed,
-    description: mongoose_1.SchemaTypes.Mixed,
-    duration: String,
-    endDate: { type: Date, required: true }, // required(2025-10-08~)
-    eventStatus: String,
-    headline: mongoose_1.SchemaTypes.Mixed,
-    location: mongoose_1.SchemaTypes.Mixed,
-    startDate: { type: Date, required: true }, // required(2025-10-08~)
-    subEvent: mongoose_1.SchemaTypes.Mixed, // support(2025-12-31~)
-    workPerformed: mongoose_1.SchemaTypes.Mixed,
-    videoFormat: mongoose_1.SchemaTypes.Mixed,
-    soundFormat: mongoose_1.SchemaTypes.Mixed,
-    subtitleLanguage: mongoose_1.SchemaTypes.Mixed,
-    dubLanguage: mongoose_1.SchemaTypes.Mixed,
-    kanaName: String,
-    offers: mongoose_1.SchemaTypes.Mixed,
-    coaInfo: mongoose_1.SchemaTypes.Mixed
-};
+const schemaDefinition = Object.assign({ project: { type: mongoose_1.SchemaTypes.Mixed, required: true }, organizer: { type: mongoose_1.SchemaTypes.Mixed, required: true }, _id: String, typeOf: { type: String, required: true }, identifier: String, name: mongoose_1.SchemaTypes.Mixed, additionalProperty: mongoose_1.SchemaTypes.Mixed, alternativeHeadline: mongoose_1.SchemaTypes.Mixed, description: mongoose_1.SchemaTypes.Mixed, duration: String, endDate: { type: Date, required: true }, eventStatus: String, headline: mongoose_1.SchemaTypes.Mixed, location: mongoose_1.SchemaTypes.Mixed, startDate: { type: Date, required: true }, subEvent: mongoose_1.SchemaTypes.Mixed, workPerformed: mongoose_1.SchemaTypes.Mixed, soundFormat: mongoose_1.SchemaTypes.Mixed, subtitleLanguage: mongoose_1.SchemaTypes.Mixed, dubLanguage: mongoose_1.SchemaTypes.Mixed, kanaName: String, offers: mongoose_1.SchemaTypes.Mixed, coaInfo: mongoose_1.SchemaTypes.Mixed }, {
+    // factory.eventSeries.IEventから廃止したので、ひとまずspread operatorで解決(2026-02-10~)
+    videoFormat: mongoose_1.SchemaTypes.Mixed
+});
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
     autoCreate: false,

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

@@ -121,6 +121,10 @@ export interface IOrderNumberSetting {
      */
     version: string;
     versioningForceProjects?: string[];
+    /**
+     * 強制的にバージョニング不使用のプロジェクト
+     */
+    versioningExceptionProjects?: string[];
 }
 export interface ITransactionNumberSetting {
     validFrom: Date;

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

@@ -22,5 +22,8 @@ export declare class OrderNumberRepo {
         orderDate: Date;
     }): Promise<string>;
     decrypt(id: string): Promise<string>;
+    /**
+     * 注文番号生成設定を検索する
+     */
     private findSetting;
 }

package/lib/chevre/repo/orderNumber.js

@@ -12,10 +12,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrderNumberRepo = void 0;
 const cdigit = require("cdigit");
 const moment = require("moment-timezone");
-// import { RedisClientType } from 'redis';
 // tslint:disable-next-line:no-require-imports no-var-requires
 const fpe = require('node-fpe-v1');
-// import { createSchema as createSettingSchema, modelName as settingModelName } from './mongoose/schemas/setting';
 const factory = require("../factory");
 const transactionNumber_1 = require("../factory/transactionNumber");
 const setting_1 = require("./mongoose/schemas/setting");
@@ -32,23 +30,9 @@ const defaultVersioningForceProjects = [
  */
 class OrderNumberRepo {
     constructor(params) {
-        // const { connection } = params;
-        // this.settingModel = connection.model(settingModelName, createSettingSchema());
         this.counterRepo = new transactionNumberCounter_1.TransactionNumberCounterRepo(params);
         this.settingModel = params.connection.model(setting_1.modelName, (0, setting_1.createSchema)());
     }
-    // private static createKey(params: {
-    //     orderDate: Date;
-    //     projectPrefix: string;
-    //     timestamp: string;
-    // }): string {
-    //     return util.format(
-    //         '%s:%s:%s',
-    //         OrderNumberRepo.REDIS_KEY_PREFIX,
-    //         params.projectPrefix,
-    //         params.timestamp
-    //     );
-    // }
     static GENERATE_VERSION0(timestamp, seq) {
         let orderNumber = `${timestamp}${seq}`;
         // checkdigit
@@ -63,7 +47,7 @@ class OrderNumberRepo {
      */
     publishByTimestamp(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { fpeSecret, version, validFrom, versioningForceProjects } = yield this.findSetting();
+            const { fpeSecret, version, validFrom, versioningForceProjects, versioningExceptionProjects } = yield this.findSetting();
             const timestamp = moment(params.orderDate)
                 .valueOf()
                 .toString();
@@ -72,7 +56,6 @@ class OrderNumberRepo {
             let dataFeedExpires;
             const dataFeedIdentifier = `${projectPrefix}:${timestamp}`;
             let incrReply;
-            // const useMongoBySettings = await this.useMongoBySettings(params);
             dataFeedExpires = moment(params.orderDate)
                 .add(1, 'minute') // ミリ秒でカウントしていくので、注文日時後1分で十分
                 .toDate();
@@ -82,14 +65,18 @@ class OrderNumberRepo {
                 expires: dataFeedExpires
             });
             let orderNumber;
-            // versioningForceProjectsであれば強制的にversioning(2026-02-05~)
-            const useVersioning = (validFrom instanceof Date && moment(validFrom)
+            let useVersioning = (validFrom instanceof Date && moment(validFrom)
                 .isSameOrBefore(params.orderDate))
+                // versioningForceProjectsであれば強制的にversioning(2026-02-05~)
                 || versioningForceProjects.includes(projectPrefix);
+            // versioningExceptionProjectsであれば強制的にversioning不使用(2026-02-10~)
+            if (versioningExceptionProjects.includes(projectPrefix)) {
+                useVersioning = false;
+            }
             if (typeof fpeSecret === 'string' && typeof version === 'string' && useVersioning) {
                 const transactionFactory = new transactionNumber_1.TransactionNumberFactory({ fpeSecret, version });
                 orderNumber = transactionFactory.generate(timestamp, incrReply);
-                orderNumber = `${projectPrefix.at(0)}${orderNumber}`;
+                orderNumber = `${projectPrefix.at(0)}${orderNumber}`; // 桁数をversion0に合わせるためにエイリアスの1文字目のみを採用
                 orderNumber = `${[
                     // tslint:disable-next-line:no-magic-numbers
                     orderNumber.slice(0, 4),
@@ -102,12 +89,6 @@ class OrderNumberRepo {
             else {
                 orderNumber = OrderNumberRepo.GENERATE_VERSION0(timestamp, incrReply);
                 orderNumber = `${projectPrefix}${orderNumber}`;
-                // orderNumber = `${timestamp}${incrReply}`;
-                // // checkdigit
-                // const cd = cdigit.luhn.compute(orderNumber);
-                // orderNumber = fpe({ password: cd })
-                //     .encrypt(orderNumber);
-                // orderNumber = `${projectPrefix}${cd}${orderNumber}`;
                 orderNumber = `${[
                     // tslint:disable-next-line:no-magic-numbers
                     orderNumber.slice(0, 4),
@@ -135,6 +116,9 @@ class OrderNumberRepo {
             }
         });
     }
+    /**
+     * 注文番号生成設定を検索する
+     */
     findSetting() {
         return __awaiter(this, void 0, void 0, function* () {
             const filterQuery = { 'project.id': { $eq: '*' } };
@@ -146,9 +130,12 @@ class OrderNumberRepo {
                 .lean()
                 .exec();
             if (setting === null || setting.orderNumber === undefined) {
-                return { versioningForceProjects: [] };
+                return {
+                    versioningForceProjects: [],
+                    versioningExceptionProjects: []
+                };
             }
-            const { fpeSecret, version, validFrom, versioningForceProjects } = setting.orderNumber;
+            const { fpeSecret, version, validFrom, versioningForceProjects, versioningExceptionProjects } = setting.orderNumber;
             if (typeof fpeSecret !== 'string' || fpeSecret === '') {
                 throw new factory.errors.NotFound('setting.orderNumber.secret');
             }
@@ -163,7 +150,8 @@ class OrderNumberRepo {
                 versioningForceProjects: [
                     ...(Array.isArray(versioningForceProjects)) ? versioningForceProjects : [],
                     ...defaultVersioningForceProjects
-                ]
+                ],
+                versioningExceptionProjects: (Array.isArray(versioningExceptionProjects)) ? versioningExceptionProjects : []
             };
         });
     }

package/lib/chevre/repo/transactionNumber.js

@@ -10,10 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionNumberRepo = void 0;
-const cdigit = require("cdigit");
 const moment = require("moment-timezone");
-// tslint:disable-next-line:no-require-imports no-var-requires
-const fpe1 = require('node-fpe-v1');
 const factory = require("../factory");
 const transactionNumber_1 = require("../factory/transactionNumber");
 const setting_1 = require("./mongoose/schemas/setting");
@@ -39,7 +36,6 @@ class TransactionNumberRepo {
             let dataFeedExpires;
             const dataFeedIdentifier = timestamp;
             let incrReply;
-            // const useMongoBySettings = await this.useMongoBySettings(params);
             dataFeedExpires = moment(params.startDate)
                 .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
                 .toDate();
@@ -56,12 +52,14 @@ class TransactionNumberRepo {
                 transactionNumber = transactionFactory.generate(timestamp, incrReply);
             }
             else {
-                transactionNumber = `${timestamp}${incrReply}`;
-                // checkdigit
-                const cd = cdigit.luhn.compute(transactionNumber);
-                transactionNumber = fpe1({ password: cd })
-                    .encrypt(transactionNumber);
-                transactionNumber = `${cd}${transactionNumber}`;
+                // discontinue version0(2026-02-10~)
+                throw new factory.errors.NotImplemented('transactionNumber with no version discontinued');
+                // transactionNumber = `${timestamp}${incrReply}`;
+                // // checkdigit
+                // const cd = cdigit.luhn.compute(transactionNumber);
+                // transactionNumber = fpe1({ password: cd })
+                //     .encrypt(transactionNumber);
+                // transactionNumber = `${cd}${transactionNumber}`;
             }
             return { transactionNumber, timestamp, incrReply };
         });

package/lib/chevre/service/event/saveScreeningEventSeries.js

@@ -188,10 +188,9 @@ function createScreeningEventSeriesFromCOA(params) {
         ? { version: params.filmFromCOA.titleBranchNum } // add version(2024-01-31~)
         : undefined);
     // redefine videoFormat(2024-09-18~)
-    // const videoFormat: factory.event.screeningEventSeries.ICOAKubun =
-    //     params.eizouKubuns.filter((kubun) => kubun.kubunCode === params.filmFromCOA.kbnEizou)[0];
-    const videoFormat = params.joueihousikiKubuns.filter(({ kubunCode }) => kubunCode === params.filmFromCOA.kbnJoueihousiki)
-        .map(({ kubunCode }) => ({ typeOf: kubunCode, name: kubunCode }));
+    // const videoFormat: factory.eventSeries.IVideoFormat[] =
+    //     params.joueihousikiKubuns.filter(({ kubunCode }) => kubunCode === params.filmFromCOA.kbnJoueihousiki)
+    //         .map(({ kubunCode }) => ({ typeOf: kubunCode, name: kubunCode }));
     return {
         project: { typeOf: params.project.typeOf, id: params.project.id },
         typeOf: factory.eventType.ScreeningEventSeries,
@@ -214,7 +213,7 @@ function createScreeningEventSeriesFromCOA(params) {
         },
         // 必須化(2023-07-12~)
         organizer: { id: params.seller.id },
-        videoFormat,
+        // videoFormat, // discontinue(2026-02-10~)
         soundFormat: [],
         workPerformed,
         duration: moment.duration(params.filmFromCOA.showTime, 'm')

package/lib/chevre/service/event/saveScreeningEvents.d.ts

@@ -8,7 +8,7 @@ type IMovieTheater = Pick<factory.place.movieTheater.IPlace, 'id' | 'typeOf' | '
 declare function saveScreeningEvents(params: {
     movieTheater: IMovieTheater;
     screeningRooms: Pick<factory.place.screeningRoom.IPlace, 'branchCode' | 'name' | 'maximumAttendeeCapacity'>[];
-    screeningEventSerieses?: factory.eventSeries.IEvent[];
+    screeningEventSerieses?: Omit<factory.eventSeries.IEvent, 'videoFormat'>[];
     project: {
         id: string;
         typeOf: factory.organizationType.Project;

package/lib/chevre/service/event/saveScreeningEvents.js

@@ -16,7 +16,6 @@ const createDebug = require("debug");
 const moment = require("moment-timezone");
 const factory = require("../../factory");
 const saveScreeningEventSeries_1 = require("./saveScreeningEventSeries");
-const USE_DEPRECATED_VIDEO_FORMAT_EVENTS = process.env.USE_DEPRECATED_VIDEO_FORMAT_EVENTS === '1';
 const debug = createDebug('chevre-domain:service:event');
 function saveScreeningEvents(params, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -102,7 +101,9 @@ function createScreeningEvents(params, options) {
                 }, [
                     'project', 'typeOf', 'eventStatus', 'identifier',
                     'name', 'kanaName', 'alternativeHeadline', 'location',
-                    'organizer', 'videoFormat', 'soundFormat', 'workPerformed',
+                    'organizer',
+                    // 'videoFormat', // 参照廃止(2026-02-10~)
+                    'soundFormat', 'workPerformed',
                     'duration', 'endDate', 'startDate', 'coaInfo',
                     'offers', 'additionalProperty'
                 ]);
@@ -171,16 +172,23 @@ function createScreeningEvents(params, options) {
     });
 }
 function minimizeSuperEvent(params) {
-    const { workPerformed, videoFormat, startDate, soundFormat, name, location, kanaName, identifier, endDate, duration, coaInfo, alternativeHeadline, typeOf, id } = params.superEvent;
-    return Object.assign({ workPerformed, startDate, soundFormat,
+    const { workPerformed, 
+    // videoFormat,
+    startDate, soundFormat, name, location, kanaName, identifier, endDate, duration, coaInfo, alternativeHeadline, typeOf, id } = params.superEvent;
+    return {
+        workPerformed, startDate, soundFormat,
         name, location, kanaName, identifier,
         endDate, duration, coaInfo, alternativeHeadline,
-        typeOf, id }, (USE_DEPRECATED_VIDEO_FORMAT_EVENTS)
-        ? {
-            // 現時点で型廃止済だがデータとしては互換性維持(2026-01-15~)
-            videoFormat
-        }
-        : undefined);
+        typeOf, id
+        // 完全に廃止(2026-02-10~)
+        // // videoFormatをデータとしても廃止(万が一に備えてUSE_DEPRECATED_VIDEO_FORMAT_EVENTSで再設定可能)(2026-02-03~)
+        // ...(USE_DEPRECATED_VIDEO_FORMAT_EVENTS)
+        //     ? {
+        //         // 現時点で型廃止済だがデータとしては互換性維持(2026-01-15~)
+        //         videoFormat
+        //     }
+        //     : undefined
+    };
 }
 /**
  * コアデータからイベントを作成する

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

@@ -81,7 +81,9 @@ function syncEventSeries2screeningEvents(params) {
             }, [
                 'additionalProperty', 'alternativeHeadline', 'description', 'dubLanguage',
                 'endDate', 'headline', 'kanaName', 'location', 'name',
-                'soundFormat', 'startDate', 'subtitleLanguage', 'typeOf', 'videoFormat', 'workPerformed'
+                'soundFormat', 'startDate', 'subtitleLanguage', 'typeOf',
+                // 'videoFormat', // 参照廃止(2026-02-10~)
+                'workPerformed'
             ]);
             const superEventFromDB = superEvents.shift();
             if (superEventFromDB === undefined) {

package/lib/chevre/service/task/createEvent/createEventBySchedule/factory.d.ts

@@ -5,7 +5,7 @@ declare function tour2creatingEvent(tour: ITourBySchedule, movieTheater: Pick<fa
     member: ICustomerMember;
 }[], maxValue: number, eventService: Pick<factory.product.IProduct, 'id' | 'name'> & {
     id: string;
-}, screeningEventSeries: Pick<factory.eventSeries.IEvent, 'location' | 'additionalProperty' | 'description' | 'endDate' | 'headline' | 'id' | 'kanaName' | 'name' | 'soundFormat' | 'startDate' | 'typeOf' | 'videoFormat' | 'workPerformed'>, project: {
+}, screeningEventSeries: Pick<factory.eventSeries.IEvent, 'location' | 'additionalProperty' | 'description' | 'endDate' | 'headline' | 'id' | 'kanaName' | 'name' | 'soundFormat' | 'startDate' | 'typeOf' | 'workPerformed'>, project: {
     id: string;
 }): ICreatingEvent4ttts;
 interface ITourBySchedule {

package/lib/chevre/service/task/createEvent/createEventBySchedule/schedule2events.js

@@ -46,7 +46,9 @@ function schedule2relatedResources(schedule) {
             id: { $eq: eventSeriesId }
         }, [
             'location', 'additionalProperty', 'description', 'endDate', 'headline', 'kanaName', 'name',
-            'soundFormat', 'startDate', 'typeOf', 'videoFormat', 'workPerformed'
+            'soundFormat', 'startDate', 'typeOf',
+            // 'videoFormat', // 参照廃止(2026-02-10~)
+            'workPerformed'
         ])).shift();
         if (screeningEventSeries === undefined) {
             throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);

package/lib/chevre/service/task/syncResourcesFromCOA.js

@@ -236,7 +236,9 @@ function syncEvents(params) {
             }, [
                 'project', 'typeOf', 'eventStatus', 'identifier',
                 'name', 'kanaName', 'alternativeHeadline', 'location',
-                'organizer', 'videoFormat', 'soundFormat', 'workPerformed',
+                'organizer',
+                // 'videoFormat', // 参照廃止(2026-02-10~)
+                'soundFormat', 'workPerformed',
                 'duration', 'endDate', 'startDate', 'coaInfo',
                 'offers', 'additionalProperty'
             ])).shift();

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "5.4.0-alpha.28",
-    "@cinerino/sdk": "13.0.0-alpha.7",
+    "@chevre/factory": "5.4.0-alpha.29",
+    "@cinerino/sdk": "13.0.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
     "@sendgrid/client": "8.1.4",
@@ -118,5 +118,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.2.0-alpha.57"
+  "version": "23.2.0-alpha.59"
 }

package/example/src/chevre/eventSeries/migrateEventSeriesOffers.ts

@@ -1,75 +0,0 @@
-// tslint:disable:no-console
-// import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../../lib/index';
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const eventSeriesRepo = await chevre.repository.EventSeries.createInstance(mongoose.connection);
-
-    const cursor = eventSeriesRepo.getCursor(
-        {
-            // _id: { $eq: 'bmd7x21f2' },
-            // 'project.id': { $eq: 'xxx' },
-            'offers.typeOf': {
-                $exists: true,
-                $eq: chevre.factory.offerType.AggregateOffer
-            }
-        },
-        {
-            // _id: 1,
-            // offers: 1,
-            // startDate: 1,
-            // project: 1,
-            // typeOf: 1
-        }
-    );
-    console.log('docs found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const eventSeries: Pick<
-            chevre.factory.eventSeries.IEvent,
-            'id' | 'offers' | 'startDate' | 'project' | 'typeOf'
-        > = doc.toObject();
-
-        console.log(
-            'alreadyMigrated?', eventSeries.project.id, eventSeries.typeOf, eventSeries.id, eventSeries.startDate, i);
-        const alreadyMigrated = eventSeries.offers?.typeOf === chevre.factory.offerType.Offer;
-
-        if (alreadyMigrated) {
-            console.log(
-                'already migrated.', eventSeries.project.id, eventSeries.typeOf, eventSeries.id, eventSeries.startDate, i);
-        } else {
-            console.log(
-                'updating...',
-                eventSeries.project.id, eventSeries.typeOf, eventSeries.id, eventSeries.startDate, i);
-            await eventSeriesRepo.saveEventSeries({
-                id: eventSeries.id,
-                attributes: <any>{
-                    ...{
-                        typeOf: eventSeries.typeOf,
-                        'offers.typeOf': chevre.factory.offerType.Offer
-                    }
-                }
-            });
-            updateCount += 1;
-            console.log(
-                'updated.',
-                eventSeries.project.id, eventSeries.typeOf, eventSeries.id, eventSeries.startDate, i);
-
-        }
-    });
-
-    console.log(i, 'docs checked');
-    console.log(updateCount, 'docs updated');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/eventSeries/migrateEventSeriesUnacceptedPaymentMethod.ts

@@ -1,93 +0,0 @@
-// 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 DEFAULT_PAYMENT_METHOD_TYPE_FOR_MOVIE_TICKET = 'MovieTicket';
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const eventSeriesRepo = await chevre.repository.EventSeries.createInstance(mongoose.connection);
-
-    const cursor = eventSeriesRepo.getCursor(
-        {
-            'project.id': { $eq: 'xxx' },
-            'offers.unacceptedPaymentMethod': {
-                $exists: true,
-                $ne: DEFAULT_PAYMENT_METHOD_TYPE_FOR_MOVIE_TICKET
-            },
-            startDate: {
-                $lte: moment()
-                    .add(-1, 'year')
-                    .toDate()
-            }
-            // _id: { $eq: 'bliy11ffa' }
-        },
-        {
-            // _id: 1,
-            // offers: 1,
-            // startDate: 1,
-            // project: 1,
-            // typeOf: 1
-        }
-    );
-    console.log('docs found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const eventSeries: Pick<
-            chevre.factory.eventSeries.IEvent,
-            'id' | 'offers' | 'startDate' | 'project' | 'typeOf'
-        > = doc.toObject();
-
-        console.log(
-            'alreadyMigrated?', eventSeries.project.id, eventSeries.typeOf, eventSeries.id, eventSeries.startDate, i);
-        const unacceptedPaymentMethod = eventSeries.offers?.unacceptedPaymentMethod;
-        const alreadyMigrated = !Array.isArray(unacceptedPaymentMethod)
-            || (Array.isArray(unacceptedPaymentMethod)
-                && unacceptedPaymentMethod.every(
-                    (paymentMethodType) => paymentMethodType === DEFAULT_PAYMENT_METHOD_TYPE_FOR_MOVIE_TICKET
-                ));
-
-        if (alreadyMigrated) {
-            console.log(
-                'already migrated.', eventSeries.project.id, eventSeries.typeOf, eventSeries.id, eventSeries.startDate, i);
-        } else {
-            if (Array.isArray(unacceptedPaymentMethod)) {
-                const newUnacceptedPaymentMethod = unacceptedPaymentMethod.filter(
-                    (paymentMethod) => paymentMethod === DEFAULT_PAYMENT_METHOD_TYPE_FOR_MOVIE_TICKET
-                );
-                console.log(
-                    'updating project...',
-                    newUnacceptedPaymentMethod,
-                    eventSeries.project.id, eventSeries.typeOf, eventSeries.id, eventSeries.startDate, i);
-                await eventSeriesRepo.saveEventSeries({
-                    id: eventSeries.id,
-                    attributes: <any>{
-                        ...{
-                            typeOf: eventSeries.typeOf,
-                            'offers.unacceptedPaymentMethod': newUnacceptedPaymentMethod
-                        }
-                    }
-                });
-                updateCount += 1;
-                console.log(
-                    'updated.',
-                    eventSeries.project.id, eventSeries.typeOf, eventSeries.id, eventSeries.startDate, i);
-            }
-        }
-    });
-
-    console.log(i, 'docs checked');
-    console.log(updateCount, 'docs updated');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/eventSeries/migrateEventSeriesVideoFormat.ts

@@ -1,80 +0,0 @@
-// tslint:disable:no-console
-// import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../../lib/index';
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const eventSeriesRepo = await chevre.repository.EventSeries.createInstance(mongoose.connection);
-
-    const cursor = eventSeriesRepo.getCursor(
-        {
-            // _id: { $eq: 'al9s38bj6' },
-            'project.id': { $nin: ['sskts-development', 'sskts-test', 'sskts-production'] }
-        },
-        {
-            // _id: 1,
-            // offers: 1,
-            // startDate: 1,
-            // project: 1,
-            // typeOf: 1
-        }
-    );
-    console.log('docs found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const eventSeries: Pick<
-            chevre.factory.eventSeries.IEvent,
-            'id' | 'videoFormat' | 'subEvent' | 'project' | 'startDate' | 'typeOf'
-        > = doc.toObject();
-
-        const videoFormatByOldAttribute: string[] =
-            (Array.isArray(eventSeries.videoFormat)) ? eventSeries.videoFormat.map(({ typeOf }) => typeOf) : [];
-        const videoFormatByNewAttribute: string[] =
-            (Array.isArray(eventSeries.subEvent?.videoFormat)) ? eventSeries.subEvent.videoFormat : [];
-        const alreadyMigrated = videoFormatByOldAttribute.length === videoFormatByNewAttribute.length
-            && videoFormatByOldAttribute.every((codeValue) => videoFormatByNewAttribute.includes(codeValue))
-            && eventSeries.subEvent?.typeOf === chevre.factory.eventType.ScreeningEvent;
-
-        if (alreadyMigrated) {
-            console.log(
-                'already migrated.', eventSeries.project.id, eventSeries.id, eventSeries.startDate, i);
-        } else {
-            const subEvent: chevre.factory.eventSeries.ISubEvent = {
-                typeOf: chevre.factory.eventType.ScreeningEvent,
-                ...(videoFormatByOldAttribute.length > 0) ? { videoFormat: videoFormatByOldAttribute } : undefined
-            };
-            console.log(
-                'updating...',
-                eventSeries.project.id, eventSeries.id, eventSeries.startDate, i, videoFormatByOldAttribute, subEvent
-            );
-            await eventSeriesRepo.saveEventSeries({
-                id: eventSeries.id,
-                attributes: <any>{
-                    ...{
-                        typeOf: eventSeries.typeOf,
-                        subEvent
-                    }
-                }
-            });
-            updateCount += 1;
-            console.log(
-                'updated.',
-                eventSeries.project.id, eventSeries.id, eventSeries.startDate, i);
-
-        }
-    });
-
-    console.log(i, 'docs checked');
-    console.log(updateCount, 'docs updated');
-}
-
-main()
-    .then()
-    .catch(console.error);