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

package/lib/chevre/repo/confirmationNumber.js

@@ -10,12 +10,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfirmationNumberRepo = void 0;
-const cdigit = require("cdigit");
+// import * as cdigit from 'cdigit';
+const crypto_1 = require("crypto");
 const moment = require("moment-timezone");
-// import { RedisClientType } from 'redis';
+const fpe2Module = require("node-fpe");
+// 型定義が新しいtypescriptに適合しないので、強制的に型変更
+const fpe2 = fpe2Module;
 // 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 fpe = require('node-fpe-v1');
 const transactionNumber_1 = require("./mongoose/schemas/transactionNumber");
 const transactionNumberCounter_1 = require("./transactionNumberCounter");
 const CONFIRMATION_NUMBER_MIN_LENGH = 4;
@@ -25,8 +27,6 @@ const TIMEZONE = 'Asia/Tokyo';
  */
 class ConfirmationNumberRepo {
     constructor(params) {
-        // const { connection } = params;
-        // this.settingModel = connection.model(settingModelName, createSettingSchema());
         this.counterRepo = new transactionNumberCounter_1.TransactionNumberCounterRepo(params);
     }
     static alignDigits(params) {
@@ -37,32 +37,32 @@ class ConfirmationNumberRepo {
         }
         return aligndNumber;
     }
-    // private static createKey(params: {
-    //     orderDate: Date;
-    // }): string {
-    //     return util.format(
-    //         '%s:%s',
-    //         ConfirmationNumberRepo.REDIS_KEY_PREFIX_NEW,
-    //         moment(params.orderDate)
-    //             .tz(TIMEZONE)
-    //             .format('YYMM')
-    //     );
-    // }
     static createDataFeedIdentifier(params) {
         return moment(params.orderDate)
             .tz(TIMEZONE)
             .format('YYMM');
     }
+    // private static count2confirmationNumberUsingFPE1(params: { count: number }): string {
+    //     // 桁数調整
+    //     let confirmationNumber: string = ConfirmationNumberRepo.alignDigits(params.count);
+    //     // checkdigit
+    //     const cd = cdigit.luhn.compute(confirmationNumber);
+    //     // debug('check digit:', cd);
+    //     confirmationNumber = fpe({ password: cd })
+    //         .encrypt(confirmationNumber);
+    //     confirmationNumber = `${cd}${confirmationNumber}`;
+    //     return confirmationNumber;
+    // }
+    // reimplement using fpe2(2026-02-02~)
     static count2confirmationNumber(params) {
         // 桁数調整
-        let confirmationNumber = ConfirmationNumberRepo.alignDigits(params.count);
-        // checkdigit
-        const cd = cdigit.luhn.compute(confirmationNumber);
-        // debug('check digit:', cd);
-        confirmationNumber = fpe({ password: cd })
-            .encrypt(confirmationNumber);
-        confirmationNumber = `${cd}${confirmationNumber}`;
-        return confirmationNumber;
+        const rawBody = ConfirmationNumberRepo.alignDigits(params.count);
+        // tslint:disable-next-line:no-magic-numbers
+        const saltDigit = (0, crypto_1.randomInt)(0, 10);
+        const saltStr = saltDigit.toString();
+        const cipher = fpe2({ secret: `${saltStr}` });
+        const encryptedBody = cipher.encrypt(rawBody);
+        return `${saltStr}${encryptedBody}`;
     }
     /**
      * 発行する
@@ -87,5 +87,12 @@ class ConfirmationNumberRepo {
             return ConfirmationNumberRepo.count2confirmationNumber({ count: incrReply });
         });
     }
+    // tslint:disable-next-line:prefer-function-over-method
+    decrypt(id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const cipher = fpe2({ secret: id[0] });
+            return cipher.decrypt(id.slice(1));
+        });
+    }
 }
 exports.ConfirmationNumberRepo = ConfirmationNumberRepo;

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

@@ -68,13 +68,6 @@ export declare class EventRepo {
      */
     static CREATE_ID(): string;
     static CREATE_MONGO_CONDITIONS(conditions: ISearchConditions): FilterQuery<factory.event.screeningEvent.IEvent>[];
-    /**
-     * 複数イベントを作成する
-     */
-    createManyEvents(params: {
-        attributes: factory.event.screeningEvent.IAttributes[];
-        expectsNoContent: boolean;
-    }): Promise<string[] | void>;
     /**
      * イベントコードをキーにして冪等置換
      */
@@ -90,11 +83,11 @@ export declare class EventRepo {
          */
         update: boolean;
     }): Promise<{
-        bulkWriteResult: BulkWriteResult;
+        bulkWriteResult?: BulkWriteResult;
         modifiedEvents: {
             id: string;
         }[];
-    } | void>;
+    }>;
     /**
      * イベント部分更新
      */
@@ -127,14 +120,6 @@ export declare class EventRepo {
         $unset?: IUnset;
         upsert: boolean;
     }[]): Promise<void>;
-    /**
-     * tttsイベントを識別子によって冪等作成する
-     */
-    saveEventByIdentifier4ttts(params: {
-        attributes: ICreatingEvent4ttts;
-    }): Promise<{
-        id: string;
-    }>;
     /**
      * イベントを検索する(inclusion projection)
      */
@@ -210,7 +195,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/event.js

@@ -264,33 +264,39 @@ class EventRepo {
         }
         return andConditions;
     }
-    /**
-     * 複数イベントを作成する
-     */
-    createManyEvents(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const insertingDocs = params.attributes.map((p) => {
-                return Object.assign({ _id: EventRepo.CREATE_ID() }, p);
-            });
-            try {
-                yield this.eventModel.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.ScreeningEvent, ['offeredBy.member.identifier']);
-                    }
-                }
-                throw error;
-            }
-            if (params.expectsNoContent) {
-                return;
-            }
-            return insertingDocs.map(({ _id }) => _id);
-        });
-    }
+    // /**
+    //  * 複数イベントを作成する
+    //  */
+    // public async createManyEvents(params: {
+    //     attributes: factory.event.screeningEvent.IAttributes[];
+    //     expectsNoContent: boolean;
+    // }): Promise<string[] | void> { // optimize response(only id)(2024-08-02~)
+    //     const insertingDocs: (factory.event.screeningEvent.IAttributes & { _id: string })[] =
+    //         params.attributes.map((p) => {
+    //             return {
+    //                 _id: EventRepo.CREATE_ID(),
+    //                 ...p
+    //             };
+    //         });
+    //     try {
+    //         await this.eventModel.insertMany<factory.event.screeningEvent.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.ScreeningEvent, ['offeredBy.member.identifier']);
+    //             }
+    //         }
+    //         throw error;
+    //     }
+    //     if (params.expectsNoContent) {
+    //         return;
+    //     }
+    //     return insertingDocs.map(({ _id }) => _id);
+    // }
     /**
      * イベントコードをキーにして冪等置換
      */
@@ -344,15 +350,27 @@ class EventRepo {
             }
             if (bulkWriteOps.length > 0) {
                 const bulkWriteResult = yield this.eventModel.bulkWrite(bulkWriteOps, { ordered: false });
-                // modifiedの場合upsertedIdsに含まれないので、idを検索する
-                const modifiedEvents = yield this.eventModel.find({ $or: queryFilters }, {
-                    _id: 0,
-                    id: { $toString: '$_id' }
-                })
-                    .lean()
-                    .exec();
-                return { bulkWriteResult, modifiedEvents };
+                // update:falseの場合、upsertedIdsのみmodifiedEventsとして返せばよい(2026-01-16~)
+                if (!update) {
+                    // BulkWriteResult -> upsertedIds: { '0': '7iri6p4m54k0r3g' }
+                    return {
+                        bulkWriteResult,
+                        modifiedEvents: Object.values(bulkWriteResult.upsertedIds)
+                            .map((id) => ({ id: String(id) }))
+                    };
+                }
+                else {
+                    // modifiedの場合upsertedIdsに含まれないので、idを検索する
+                    const modifiedEvents = yield this.eventModel.find({ $or: queryFilters }, {
+                        _id: 0,
+                        id: { $toString: '$_id' }
+                    })
+                        .lean()
+                        .exec();
+                    return { bulkWriteResult, modifiedEvents };
+                }
             }
+            return { modifiedEvents: [] };
         });
     }
     /**
@@ -465,54 +483,47 @@ class EventRepo {
             }
         });
     }
-    /**
-     * tttsイベントを識別子によって冪等作成する
-     */
-    saveEventByIdentifier4ttts(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // const { oldEventId } = params;
-            const _a = params.attributes, { project, typeOf, eventStatus, identifier, organizer } = _a, updateFields = __rest(_a, ["project", "typeOf", "eventStatus", "identifier", "organizer"]);
-            // const identifier = oldEventId;
-            if (typeof identifier !== 'string' || identifier.length === 0) {
-                throw new factory.errors.ArgumentNull('identifier');
-            }
-            const id = EventRepo.CREATE_ID();
-            const doc = yield this.eventModel.findOneAndUpdate(
-            // 全イベントにidentifierを保証したので、additionalPropertyによるフィルターからidentifierによるフィルターへ変更(2025-09-05~)
-            // {
-            //     'project.id': { $eq: project.id },
-            //     typeOf: { $eq: typeOf },
-            //     // 追加特性をキーに更新
-            //     additionalProperty: {
-            //         $exists: true,
-            //         $all: [{ name: 'oldEventId', value: identifier }]
-            //     }
-            // },
-            {
-                'project.id': { $eq: project.id },
-                identifier: { $exists: true, $eq: identifier }
-            }, 
-            // upsertの場合、createがありうるので属性を除外しない
-            {
-                $setOnInsert: {
-                    _id: id,
-                    typeOf,
-                    project,
-                    eventStatus,
-                    organizer,
-                    identifier // イベントコードを必ず追加(2025-09-03~)
-                    // ...(typeof identifier === 'string' && identifier !== '') ? { identifier } : undefined
-                },
-                $set: updateFields
-            }, { upsert: true, new: true, projection: { _id: 1 } })
-                .lean()
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.eventModel.modelName);
-            }
-            return { id: doc._id }; // optimize(2024-07-31~)
-        });
-    }
+    // /**
+    //  * tttsイベントを識別子によって冪等作成する
+    //  */
+    // public async saveEventByIdentifier4ttts(params: {
+    //     // oldEventId: string;
+    //     attributes: ICreatingEvent4ttts;
+    // }): Promise<{ id: string }> {
+    //     // const { oldEventId } = params;
+    //     const { project, typeOf, eventStatus, identifier, organizer, ...updateFields } = params.attributes;
+    //     // const identifier = oldEventId;
+    //     if (typeof identifier !== 'string' || identifier.length === 0) {
+    //         throw new factory.errors.ArgumentNull('identifier');
+    //     }
+    //     const id = EventRepo.CREATE_ID();
+    //     const doc = await this.eventModel.findOneAndUpdate(
+    //         {
+    //             'project.id': { $eq: project.id },
+    //             identifier: { $exists: true, $eq: identifier }
+    //         },
+    //         // upsertの場合、createがありうるので属性を除外しない
+    //         {
+    //             $setOnInsert: {
+    //                 _id: id,
+    //                 typeOf,
+    //                 project,
+    //                 eventStatus,
+    //                 organizer,
+    //                 identifier // イベントコードを必ず追加(2025-09-03~)
+    //                 // ...(typeof identifier === 'string' && identifier !== '') ? { identifier } : undefined
+    //             },
+    //             $set: updateFields
+    //         },
+    //         { upsert: true, new: true, projection: { _id: 1 } }
+    //     )
+    //         .lean<{ _id: string }>()
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(this.eventModel.modelName);
+    //     }
+    //     return { id: doc._id }; // optimize(2024-07-31~)
+    // }
     /**
      * イベントを検索する(inclusion projection)
      */

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

@@ -48,5 +48,13 @@ export declare class EventOfferRepo {
             id: string;
         };
     }): Promise<DeleteResult>;
+    /**
+     * 有効期間を過ぎたイベントオファーを削除する
+     */
+    deleteEventOffersExpired(params: {
+        validThrough: {
+            $lte: Date;
+        };
+    }): Promise<DeleteResult>;
 }
 export {};

package/lib/chevre/repo/eventOffer.js

@@ -187,5 +187,16 @@ class EventOfferRepo {
                 .exec();
         });
     }
+    /**
+     * 有効期間を過ぎたイベントオファーを削除する
+     */
+    deleteEventOffersExpired(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.eventOfferModel.deleteMany({
+                validThrough: { $lte: params.validThrough.$lte }
+            })
+                .exec();
+        });
+    }
 }
 exports.EventOfferRepo = EventOfferRepo;

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;
 };
@@ -14,39 +14,22 @@ export declare class EventSeriesRepo {
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(conditions: ISearchConditions): FilterQuery<factory.eventSeries.IEvent>[];
     /**
-     * 複数イベントを作成する
-     */
-    createManyEventSeries(params: {
-        attributes: factory.eventSeries.IAttributes[];
-        expectsNoContent: boolean;
-    }): Promise<string[] | void>;
-    /**
-     * コンテンツ+バージョンをキーにして、なければ作成する(複数対応)
-     */
-    createIfNotExistByWorkPerformed(params: {
-        attributes: factory.eventSeries.IAttributes;
-    }[]): Promise<BulkWriteResult | void>;
-    /**
-     * コンテンツ+バージョンをキーにして冪等置換
+     * 施設+コンテンツ+バージョンをキーにして冪等置換
      */
     upsertByVersion(params: {
         $set: factory.eventSeries.IAttributes;
         $unset?: IUnset;
-    }[]): Promise<{
-        bulkWriteResult4insert: BulkWriteResult;
-        modifiedEvents: {
-            id: string;
-        }[];
-    } | void>;
-    saveEventSeries(params: {
-        id?: string;
-        attributes: factory.eventSeries.IAttributes;
+    }[], options: {
         /**
-         * ドキュメント作成時には無視される
+         * falseの場合setOnInsertのみ
+         * trueの場合setOnInsert+setのみ
          */
-        $unset?: IUnset;
+        upsert: boolean;
     }): Promise<{
-        id: string;
+        bulkWriteResult?: BulkWriteResult;
+        modifiedEvents: {
+            id: string;
+        }[];
     }>;
     /**
      * sskts施設コンテンツ保管
@@ -103,18 +86,22 @@ 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;
     } & Required<{
         _id: string;
     }>>>;
+    unsetUnnecessaryFields(params: {
+        filter: FilterQuery<factory.eventSeries.IEvent>;
+        $unset: IUnset;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
 }
 export {};