@chevre/domain 23.2.0-alpha.6 → 23.2.0-alpha.60

package/lib/chevre/repo/serviceOutputIdentifier.js

@@ -10,60 +10,75 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceOutputIdentifierRepo = void 0;
-const cdigit = require("cdigit");
+// import * as cdigit from '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');
-// import { createSchema as createSettingSchema, modelName as settingModelName } from './mongoose/schemas/setting';
-const transactionNumber_1 = require("./mongoose/schemas/transactionNumber");
+// const fpe = require('node-fpe-v1');
+const factory = require("../factory");
+const transactionNumber_1 = require("../factory/transactionNumber");
+const setting_1 = require("./mongoose/schemas/setting");
+const transactionNumber_2 = require("./mongoose/schemas/transactionNumber");
 const transactionNumberCounter_1 = require("./transactionNumberCounter");
 /**
  * サービスアウトプット識別子リポジトリ
  */
 class ServiceOutputIdentifierRepo {
     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: {
-    //     startDate: Date;
-    //     timestamp: string;
-    // }): string {
-    //     return util.format(
-    //         '%s:%s',
-    //         ServiceOutputIdentifierRepo.REDIS_KEY_PREFIX,
-    //         params.timestamp
-    //     );
-    // }
     /**
      * タイムスタンプから発行する
      */
-    publishByTimestamp(params) {
+    issueServiceOutputIdentifier(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { fpeSecret, version } = yield this.findSetting();
             const timestamp = moment(params.startDate)
                 .valueOf()
                 .toString();
             let dataFeedExpires;
             const dataFeedIdentifier = timestamp;
             let incrReply;
-            // const useMongoBySettings = await this.useMongoBySettings(params);
             dataFeedExpires = moment(params.startDate)
                 .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
                 .toDate();
             incrReply = yield this.counterRepo.incrementByMongo({
                 identifier: dataFeedIdentifier,
-                includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.serviceOutputIdentifier },
+                includedInDataCatalog: { identifier: transactionNumber_2.DataCatalogIdentifier.serviceOutputIdentifier },
                 expires: dataFeedExpires
             });
-            let identifier = `${timestamp}${incrReply}`;
-            // checkdigit
-            const cd = cdigit.luhn.compute(identifier);
-            identifier = fpe({ password: cd })
-                .encrypt(identifier);
-            identifier = `${cd}${identifier}`;
-            return identifier;
+            const transactionFactory = new transactionNumber_1.TransactionNumberFactory({ fpeSecret, version });
+            return transactionFactory.generate(timestamp, incrReply);
+            // let identifier: string = `${timestamp}${incrReply}`;
+            // // checkdigit
+            // const cd = cdigit.luhn.compute(identifier);
+            // identifier = fpe({ password: cd })
+            //     .encrypt(identifier);
+            // identifier = `${cd}${identifier}`;
+            // return identifier;
+        });
+    }
+    findSetting() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const filterQuery = { 'project.id': { $eq: '*' } };
+            const projection = {
+                _id: 0,
+                serviceOutputIdentifier: 1
+            };
+            const setting = yield this.settingModel.findOne(filterQuery, projection)
+                .lean()
+                .exec();
+            if (setting === null || setting.serviceOutputIdentifier === undefined) {
+                throw new factory.errors.NotFound('setting.serviceOutputIdentifier');
+            }
+            const { fpeSecret, version } = setting.serviceOutputIdentifier;
+            if (typeof fpeSecret !== 'string' || fpeSecret === '') {
+                throw new factory.errors.NotFound('setting.serviceOutputIdentifier.secret');
+            }
+            if (typeof version !== 'string' || version === '') {
+                throw new factory.errors.NotFound('setting.serviceOutputIdentifier.version');
+            }
+            return { fpeSecret, version };
         });
     }
 }

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

@@ -22,7 +22,7 @@ export declare class SettingRepo {
                 $eq: string;
             };
         };
-    }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onTaskStatusChanged' | 'onResourceUpdated' | 'defaultSenderEmail' | 'useInformResourceTypes' | 'userPoolIdNew' | 'userPoolIdOld' | 'storage' | 'quota' | 'triggerWebhook' | 'waiter'>): Promise<import("mongoose").UpdateWriteOpResult>;
+    }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onTaskStatusChanged' | 'onResourceUpdated' | 'defaultSenderEmail' | 'useInformResourceTypes' | 'userPoolIdNew' | 'userPoolIdOld' | 'storage' | 'quota' | 'triggerWebhook' | 'waiter' | 'orderNumber' | 'transactionNumber'>): Promise<import("mongoose").UpdateWriteOpResult>;
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<ISetting>;
         $unset: any;

package/lib/chevre/repo/setting.js

@@ -49,9 +49,9 @@ class SettingRepo {
     }
     updateByProject(filter, update) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { onEventChanged, onReservationStatusChanged, onTaskStatusChanged, onResourceUpdated, defaultSenderEmail, useInformResourceTypes, userPoolIdNew, userPoolIdOld, storage, quota, triggerWebhook, waiter } = update;
+            const { onEventChanged, onReservationStatusChanged, onTaskStatusChanged, onResourceUpdated, defaultSenderEmail, useInformResourceTypes, userPoolIdNew, userPoolIdOld, storage, quota, triggerWebhook, waiter, orderNumber, transactionNumber } = update;
             return this.settingModel.updateOne({ 'project.id': { $eq: filter.project.id.$eq } }, {
-                $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (onEventChanged !== undefined) ? { onEventChanged } : undefined), (onReservationStatusChanged !== undefined) ? { onReservationStatusChanged } : undefined), (onTaskStatusChanged !== undefined) ? { onTaskStatusChanged } : undefined), (onResourceUpdated !== undefined) ? { onResourceUpdated } : undefined), (defaultSenderEmail !== undefined) ? { defaultSenderEmail } : undefined), (useInformResourceTypes !== undefined) ? { useInformResourceTypes } : undefined), (userPoolIdNew !== undefined) ? { userPoolIdNew } : undefined), (userPoolIdOld !== undefined) ? { userPoolIdOld } : undefined), (storage !== undefined) ? { storage } : undefined), (quota !== undefined) ? { quota } : undefined), (triggerWebhook !== undefined) ? { triggerWebhook } : undefined), (waiter !== undefined) ? { waiter } : undefined)
+                $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (onEventChanged !== undefined) ? { onEventChanged } : undefined), (onReservationStatusChanged !== undefined) ? { onReservationStatusChanged } : undefined), (onTaskStatusChanged !== undefined) ? { onTaskStatusChanged } : undefined), (onResourceUpdated !== undefined) ? { onResourceUpdated } : undefined), (defaultSenderEmail !== undefined) ? { defaultSenderEmail } : undefined), (useInformResourceTypes !== undefined) ? { useInformResourceTypes } : undefined), (userPoolIdNew !== undefined) ? { userPoolIdNew } : undefined), (userPoolIdOld !== undefined) ? { userPoolIdOld } : undefined), (storage !== undefined) ? { storage } : undefined), (quota !== undefined) ? { quota } : undefined), (triggerWebhook !== undefined) ? { triggerWebhook } : undefined), (waiter !== undefined) ? { waiter } : undefined), (orderNumber !== undefined) ? { orderNumber } : undefined), (transactionNumber !== undefined) ? { transactionNumber } : undefined)
             })
                 .exec();
         });

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

@@ -34,7 +34,7 @@ type ICreatingTask = Pick<factory.task.IAttributes<factory.taskName>, 'data' | '
 export declare class TaskRepo {
     readonly taskModel: IModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.task.ISearchConditions): FilterQuery<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/createAccountingReport").ITask | import("@chevre/factory/lib/task/createEvent").ITask | import("@chevre/factory/lib/task/deletePerson").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.task.ISearchConditions): FilterQuery<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/createAccountingReport").ITask | import("@chevre/factory/lib/task/createEvent").ITask | import("@chevre/factory/lib/task/deletePerson").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceDeleted").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask>[];
     runImmediately(params: Pick<factory.task.IAttributes<factory.taskName>, 'data' | 'expires' | 'name' | 'project' | 'remainingNumberOfTries' | 'runsAt'> & {
         alternateName?: never;
         identifier?: never;

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

@@ -1,12 +1,15 @@
 import type { Connection } from 'mongoose';
 interface IPublishResult {
     transactionNumber: string;
+    timestamp: string;
+    incrReply: number;
 }
 /**
  * 取引番号リポジトリ
  */
 export declare class TransactionNumberRepo {
     private readonly counterRepo;
+    private readonly settingModel;
     constructor(params: {
         connection: Connection;
     });
@@ -16,5 +19,7 @@ export declare class TransactionNumberRepo {
     publishByTimestamp(params: {
         startDate: Date;
     }): Promise<IPublishResult>;
+    decrypt(id: string): Promise<string>;
+    private findSetting;
 }
 export {};

package/lib/chevre/repo/transactionNumber.js

@@ -10,60 +10,96 @@ 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");
-// import { RedisClientType } from 'redis';
-// tslint:disable-next-line:no-require-imports no-var-requires
-const fpe = require('node-fpe');
-// import { createSchema as createSettingSchema, modelName as settingModelName } from './mongoose/schemas/setting';
-const transactionNumber_1 = require("./mongoose/schemas/transactionNumber");
+const factory = require("../factory");
+const transactionNumber_1 = require("../factory/transactionNumber");
+const setting_1 = require("./mongoose/schemas/setting");
+const transactionNumber_2 = require("./mongoose/schemas/transactionNumber");
 const transactionNumberCounter_1 = require("./transactionNumberCounter");
 /**
  * 取引番号リポジトリ
  */
 class TransactionNumberRepo {
     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: {
-    //     startDate: Date;
-    //     timestamp: string;
-    // }): string {
-    //     return util.format(
-    //         '%s:%s',
-    //         TransactionNumberRepo.REDIS_KEY_PREFIX,
-    //         params.timestamp
-    //     );
-    // }
     /**
      * タイムスタンプから発行する
      */
     publishByTimestamp(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { fpeSecret, version, validFrom } = yield this.findSetting();
             const timestamp = moment(params.startDate)
                 .valueOf()
                 .toString();
             let dataFeedExpires;
             const dataFeedIdentifier = timestamp;
             let incrReply;
-            // const useMongoBySettings = await this.useMongoBySettings(params);
             dataFeedExpires = moment(params.startDate)
                 .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
                 .toDate();
             incrReply = yield this.counterRepo.incrementByMongo({
                 identifier: dataFeedIdentifier,
-                includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.transactionNumber },
+                includedInDataCatalog: { identifier: transactionNumber_2.DataCatalogIdentifier.transactionNumber },
                 expires: dataFeedExpires
             });
-            let transactionNumber = `${timestamp}${incrReply}`;
-            // checkdigit
-            const cd = cdigit.luhn.compute(transactionNumber);
-            transactionNumber = fpe({ password: cd })
-                .encrypt(transactionNumber);
-            transactionNumber = `${cd}${transactionNumber}`;
-            return { transactionNumber };
+            let transactionNumber;
+            const useVersioning = validFrom instanceof Date && moment(validFrom)
+                .isSameOrBefore(params.startDate);
+            if (typeof fpeSecret === 'string' && typeof version === 'string' && useVersioning) {
+                const transactionFactory = new transactionNumber_1.TransactionNumberFactory({ fpeSecret, version });
+                transactionNumber = transactionFactory.generate(timestamp, incrReply);
+            }
+            else {
+                // 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 };
+        });
+    }
+    decrypt(id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { fpeSecret, version } = yield this.findSetting();
+            if (typeof fpeSecret === 'string' && typeof version === 'string') {
+                const transactionFactory = new transactionNumber_1.TransactionNumberFactory({ fpeSecret, version });
+                return transactionFactory.decrypt(id);
+            }
+            else {
+                throw new factory.errors.NotImplemented('no version not implemented');
+            }
+        });
+    }
+    findSetting() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const filterQuery = { 'project.id': { $eq: '*' } };
+            const projection = {
+                _id: 0,
+                transactionNumber: 1
+            };
+            const setting = yield this.settingModel.findOne(filterQuery, projection)
+                .lean()
+                .exec();
+            if (setting === null || setting.transactionNumber === undefined) {
+                return {};
+            }
+            const { fpeSecret, version, validFrom } = setting.transactionNumber;
+            if (typeof fpeSecret !== 'string' || fpeSecret === '') {
+                throw new factory.errors.NotFound('setting.transactionNumber.secret');
+            }
+            if (typeof version !== 'string' || version === '') {
+                throw new factory.errors.NotFound('setting.transactionNumber.version');
+            }
+            if (!(validFrom instanceof Date)) {
+                throw new factory.errors.NotFound('setting.transactionNumber.validFrom must be Date');
+            }
+            return { fpeSecret, version, validFrom };
         });
     }
 }

package/lib/chevre/repository.d.ts

@@ -51,6 +51,7 @@ import type { PaymentServiceProviderRepo } from './repo/paymentServiceProvider';
 import type { PendingReservationRepo } from './repo/pendingReservation';
 import type { PermitRepo } from './repo/permit';
 import type { BusStopRepo } from './repo/place/busStop';
+import type { EntranceGateRepo } from './repo/place/entranceGate';
 import type { HasPOSRepo } from './repo/place/hasPOS';
 import type { MovieTheaterRepo } from './repo/place/movieTheater';
 import type { ScreeningRoomRepo } from './repo/place/screeningRoom';
@@ -316,6 +317,13 @@ export declare namespace place {
     namespace BusStop {
         function createInstance(...params: ConstructorParameters<typeof BusStopRepo>): Promise<BusStopRepo>;
     }
+    type EntranceGate = EntranceGateRepo;
+    /**
+     * 施設の入場ゲートリポジトリ
+     */
+    namespace EntranceGate {
+        function createInstance(...params: ConstructorParameters<typeof EntranceGateRepo>): Promise<EntranceGateRepo>;
+    }
     type HasPOS = HasPOSRepo;
     /**
      * 施設PointOfSalesリポジトリ

package/lib/chevre/repository.js

@@ -721,6 +721,22 @@ var place;
         }
         BusStop.createInstance = createInstance;
     })(BusStop = place.BusStop || (place.BusStop = {}));
+    /**
+     * 施設の入場ゲートリポジトリ
+     */
+    let EntranceGate;
+    (function (EntranceGate) {
+        let repo;
+        function createInstance(...params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                if (repo === undefined) {
+                    repo = (yield Promise.resolve().then(() => require('./repo/place/entranceGate'))).EntranceGateRepo;
+                }
+                return new repo(...params);
+            });
+        }
+        EntranceGate.createInstance = createInstance;
+    })(EntranceGate = place.EntranceGate || (place.EntranceGate = {}));
     /**
      * 施設PointOfSalesリポジトリ
      */

package/lib/chevre/service/assetTransaction/reserve/start/factory/createStartParams.js

@@ -38,7 +38,7 @@ function optimizeReservationSuperEvent(params, useOptimizeReservation) {
     const superEvent = params.superEvent;
     return Object.assign(Object.assign({ id: superEvent.id, 
         // kanaName: superEvent.kanaName, // 廃止(2024-01-26~)
-        location: superEvent.location, name: superEvent.name, soundFormat: superEvent.soundFormat, typeOf: superEvent.typeOf, videoFormat: superEvent.videoFormat, workPerformed: superEvent.workPerformed }, (superEvent.headline !== undefined)
+        location: superEvent.location, name: superEvent.name, soundFormat: superEvent.soundFormat, typeOf: superEvent.typeOf, workPerformed: superEvent.workPerformed }, (superEvent.headline !== undefined)
         ? { headline: superEvent.headline }
         : undefined), (useOptimizeReservation)
         ? {}
@@ -46,7 +46,15 @@ function optimizeReservationSuperEvent(params, useOptimizeReservation) {
             additionalProperty: (Array.isArray(superEvent.additionalProperty))
                 ? superEvent.additionalProperty
                 : []
-        });
+        }
+    // videoFormatをデータとしても廃止(万が一に備えてUSE_DEPRECATED_VIDEO_FORMATで再設定可能)(2026-02-03~)
+    // ...(USE_DEPRECATED_VIDEO_FORMAT)
+    //     ? {
+    //         // 現時点で型廃止済だがデータとしては互換性維持(2026-01-15~)
+    //         videoFormat: (<any>superEvent).videoFormat
+    //     }
+    //     : undefined
+    );
 }
 function createIssuedThrough(params) {
     var _a;

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

@@ -19,6 +19,6 @@ declare function processUpdateMovieTheater(params: IImportFromCOAParams): (repos
         id: string;
     };
     movieTheater: IMovieTheater;
-    screeningRooms: Omit<factory.place.screeningRoom.IPlace, "containsPlace" | "parentOrganization">[];
+    screeningRooms: Pick<factory.place.screeningRoom.IPlace, "additionalProperty" | "address" | "branchCode" | "name" | "openSeatingAllowed">[];
 }>;
 export { processUpdateMovieTheater };

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

@@ -65,7 +65,7 @@ function processUpdateMovieTheater(params) {
             if (movieTheater === undefined) {
                 throw new factory.errors.NotFound(factory.placeType.MovieTheater);
             }
-            screeningRooms = yield repos.screeningRoom.searchScreeningRooms({
+            screeningRooms = yield repos.screeningRoom.findRooms({
                 project: { id: { $eq: params.project.id } },
                 containedInPlace: { branchCode: { $eq: movieTheater.branchCode } }
             });
@@ -124,17 +124,19 @@ function createMovieTheaterFromCOA(project, seller, theaterFromCOA, screensFromC
                 typeOf: 'QuantitativeValue',
                 value: 1200,
                 unitCode: factory.unitCode.Sec
-            },
-            availabilityStartsGraceTimeOnPOS: {
-                typeOf: 'QuantitativeValue',
-                value: -93,
-                unitCode: factory.unitCode.Day
-            },
-            availabilityEndsGraceTimeOnPOS: {
-                typeOf: 'QuantitativeValue',
-                value: 2678400,
-                unitCode: factory.unitCode.Sec
             }
+            // discontinue(2026-01-15~)
+            // availabilityStartsGraceTimeOnPOS: {
+            //     typeOf: 'QuantitativeValue',
+            //     value: -93,
+            //     unitCode: factory.unitCode.Day
+            // },
+            // discontinue(2026-01-15~)
+            // availabilityEndsGraceTimeOnPOS: {
+            //     typeOf: 'QuantitativeValue',
+            //     value: 2678400,
+            //     unitCode: factory.unitCode.Sec
+            // }
         },
         parentOrganization: { id: seller.id, typeOf: factory.organizationType.Corporation }
     };

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

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

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

@@ -101,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'
                 ]);
@@ -170,20 +172,22 @@ function createScreeningEvents(params, options) {
     });
 }
 function minimizeSuperEvent(params) {
-    const { workPerformed, videoFormat, startDate, soundFormat, name, location, kanaName, identifier, endDate, duration, coaInfo, alternativeHeadline, 
-    // additionalProperty,
-    typeOf, id
-    // project,
-    // organizer,
-    // offers,
-    // eventStatus
-     } = params.superEvent;
+    const { workPerformed, 
+    // videoFormat,
+    startDate, soundFormat, name, location, kanaName, identifier, endDate, duration, coaInfo, alternativeHeadline, typeOf, id } = params.superEvent;
     return {
-        workPerformed, videoFormat, startDate, soundFormat,
+        workPerformed, startDate, soundFormat,
         name, location, kanaName, identifier,
         endDate, duration, coaInfo, alternativeHeadline,
-        // additionalProperty,
         typeOf, id
+        // 完全に廃止(2026-02-10~)
+        // // videoFormatをデータとしても廃止(万が一に備えてUSE_DEPRECATED_VIDEO_FORMAT_EVENTSで再設定可能)(2026-02-03~)
+        // ...(USE_DEPRECATED_VIDEO_FORMAT_EVENTS)
+        //     ? {
+        //         // 現時点で型廃止済だがデータとしては互換性維持(2026-01-15~)
+        //         videoFormat
+        //     }
+        //     : undefined
     };
 }
 /**
@@ -266,7 +270,7 @@ function createScreeningEventFromCOA(params) {
         name: params.superEvent.name,
         eventStatus: factory.eventStatusType.EventScheduled,
         location: {
-            typeOf: params.screenRoom.typeOf,
+            typeOf: factory.placeType.ScreeningRoom,
             branchCode: params.screenRoom.branchCode,
             name: params.screenRoom.name
         },

package/lib/chevre/service/offer/event/authorize/factory.js

@@ -297,7 +297,15 @@ function createReservation(params) {
             startDate: moment(event.startDate)
                 .toDate(),
             // 最適化(2022-05-31~)
-            superEvent: Object.assign(Object.assign({ typeOf: event.superEvent.typeOf, id: event.superEvent.id, location: event.superEvent.location, name: event.superEvent.name, soundFormat: event.superEvent.soundFormat, videoFormat: event.superEvent.videoFormat, workPerformed }, (typeof event.superEvent.duration === 'string') ? { duration: event.superEvent.duration } : undefined), (event.superEvent.headline !== undefined) ? { headline: event.superEvent.headline } : undefined)
+            superEvent: Object.assign(Object.assign({ typeOf: event.superEvent.typeOf, id: event.superEvent.id, location: event.superEvent.location, name: event.superEvent.name, soundFormat: event.superEvent.soundFormat, workPerformed }, (typeof event.superEvent.duration === 'string') ? { duration: event.superEvent.duration } : undefined), (event.superEvent.headline !== undefined) ? { headline: event.superEvent.headline } : undefined
+            // videoFormatをデータとしても廃止(万が一に備えてUSE_DEPRECATED_VIDEO_FORMATで再設定可能)(2026-02-03~)
+            // ...(USE_DEPRECATED_VIDEO_FORMAT)
+            //     ? {
+            //         // 現時点で型廃止済だがデータとしては互換性維持(2026-01-15~)
+            //         videoFormat: (<any>event.superEvent).videoFormat
+            //     }
+            //     : undefined
+            )
         };
         if (params.issuedThrough.typeOf !== factory.product.ProductType.EventService) {
             throw new factory.errors.Argument('issuedThrough', `issuedThrough.typeOf must be ${factory.product.ProductType.EventService}`);

package/lib/chevre/service/offer/event/searchEventTicketOffers.js

@@ -127,7 +127,7 @@ function searchTicketOffersByItemOffered(params) {
 function searchEventTicketOffersByEvent(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const event = params.event;
         let soundFormatTypes = [];
         let videoFormatTypes = [];
@@ -137,13 +137,16 @@ function searchEventTicketOffersByEvent(params) {
                 page: 1,
                 id: { $eq: event.superEvent.id }
                 // typeOf: factory.eventType.ScreeningEventSeries
-            }, ['soundFormat', 'videoFormat']);
+            }, 
+            // ['soundFormat', 'videoFormat', 'subEvent']
+            ['soundFormat', 'subEvent']);
             const superEvent = superEvents.shift();
             if (superEvent === undefined) {
                 throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);
             }
             soundFormatTypes = (Array.isArray(superEvent.soundFormat)) ? superEvent.soundFormat.map((f) => f.typeOf) : [];
-            videoFormatTypes = (Array.isArray(superEvent.videoFormat)) ? superEvent.videoFormat.map((f) => f.typeOf) : [];
+            // videoFormatTypes = (Array.isArray(superEvent.videoFormat)) ? superEvent.videoFormat.map((f) => f.typeOf) : [];
+            videoFormatTypes = (Array.isArray((_a = superEvent.subEvent) === null || _a === void 0 ? void 0 : _a.videoFormat)) ? superEvent.subEvent.videoFormat : [];
         }
         const unacceptedPaymentMethod = getUnacceptedPaymentMethodByEvent({ event });
         // 上映方式がなければMovieTicket除外(2023-02-21~)
@@ -151,7 +154,7 @@ function searchEventTicketOffersByEvent(params) {
         // 興行設定があれば興行のカタログを参照する(2022-08-31~)
         const eventOffers = event.offers;
         const { availableOffers, sortedOfferIds } = yield searchTicketOffersByItemOffered({
-            itemOffered: { id: String((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) },
+            itemOffered: { id: String((_b = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _b === void 0 ? void 0 : _b.id) },
             // ids: params.ids,
             store: params.store,
             limit: params.limit,

package/lib/chevre/service/offer/event/searchOfferAppliesToMovieTicket.js

@@ -28,7 +28,7 @@ function getUnacceptedPaymentMethodByEvent(params) {
  */
 function searchOfferAppliesToMovieTicket(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         // optimize(2024-07-18~)
         const event = yield repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'startDate', 'typeOf', 'superEvent.id', 'offers.itemOffered.id', 'offers.unacceptedPaymentMethod']);
         // let soundFormatTypes: string[] = [];
@@ -39,13 +39,16 @@ function searchOfferAppliesToMovieTicket(params) {
                 page: 1,
                 id: { $eq: event.superEvent.id }
                 // typeOf: factory.eventType.ScreeningEventSeries
-            }, ['soundFormat', 'videoFormat']);
+            }, 
+            // ['soundFormat', 'videoFormat', 'subEvent']
+            ['soundFormat', 'subEvent']);
             const superEvent = superEvents.shift();
             if (superEvent === undefined) {
                 throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);
             }
             // soundFormatTypes = (Array.isArray(superEvent.soundFormat)) ? superEvent.soundFormat.map((f) => f.typeOf) : [];
-            videoFormatTypes = (Array.isArray(superEvent.videoFormat)) ? superEvent.videoFormat.map((f) => f.typeOf) : [];
+            // videoFormatTypes = (Array.isArray(superEvent.videoFormat)) ? superEvent.videoFormat.map((f) => f.typeOf) : [];
+            videoFormatTypes = (Array.isArray((_a = superEvent.subEvent) === null || _a === void 0 ? void 0 : _a.videoFormat)) ? superEvent.subEvent.videoFormat : [];
         }
         const unacceptedPaymentMethod = getUnacceptedPaymentMethodByEvent({ event });
         // 上映方式がなければMovieTicket除外
@@ -53,7 +56,7 @@ function searchOfferAppliesToMovieTicket(params) {
         // 興行設定があれば興行のカタログを参照する
         const eventOffers = event.offers;
         let catalogId;
-        if (typeof ((_a = eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
+        if (typeof ((_b = eventOffers.itemOffered) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
             const eventService = (yield repos.product.projectFields({
                 limit: 1,
                 page: 1,
@@ -65,7 +68,7 @@ function searchOfferAppliesToMovieTicket(params) {
                 throw new factory.errors.NotFound(factory.product.ProductType.EventService);
             }
             // const firstCatalogIdOfProduct = eventService.hasOfferCatalog?.id; // migrate to itemListElement(2024-09-30~)
-            const firstCatalogIdOfProduct = (_c = (_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.itemListElement.at(0)) === null || _c === void 0 ? void 0 : _c.id;
+            const firstCatalogIdOfProduct = (_d = (_c = eventService.hasOfferCatalog) === null || _c === void 0 ? void 0 : _c.itemListElement.at(0)) === null || _d === void 0 ? void 0 : _d.id;
             if (typeof firstCatalogIdOfProduct === 'string') {
                 catalogId = firstCatalogIdOfProduct;
             }
@@ -83,7 +86,7 @@ function searchOfferAppliesToMovieTicket(params) {
         }
         return repos.offer.searchAvaialbleAppliesToMovieTicketByOfferCatalogId({
             subOfferCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
-            availableAtOrFrom: { id: (_d = params.store) === null || _d === void 0 ? void 0 : _d.id },
+            availableAtOrFrom: { id: (_e = params.store) === null || _e === void 0 ? void 0 : _e.id },
             unacceptedPaymentMethod: unacceptedPaymentMethod,
             excludeAppliesToMovieTicket: excludeAppliesToMovieTicket,
             onlyValid: params.onlyValid === true,