@chevre/domain 23.0.0-alpha.1 → 23.0.0-alpha.10

package/example/src/chevre/note/findNotes.ts

@@ -0,0 +1,34 @@
+// tslint:disable:no-console no-magic-numbers
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const noteRepo = await chevre.repository.Note.createInstance(mongoose.connection);
+    const notes = await noteRepo.findNotes(
+        {
+            limit: 10,
+            page: 1,
+            project: { id: { $eq: project.id } },
+            hasDigitalDocumentPermission: {
+                grantee: {
+                    audienceType: {
+                        $eq: chevre.factory.creativeWork.noteDigitalDocument.PermissionGranteeAudienceType.Public
+                    }
+                }
+            }
+        },
+        ['about', 'identifier']
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(notes, { depth: null });
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/note/upsertNotesByIdentifier.ts

@@ -15,7 +15,10 @@ async function main() {
         chevre.factory.creativeWork.noteDigitalDocument.INoteAboutProduct,
         'about' | 'creator' | 'identifier' | 'project' | 'provider' | 'text' | 'version' | 'hasDigitalDocumentPermission'
     > = {
-        about: { id: '656038908b1cd5ce629f5992', typeOf: chevre.factory.product.ProductType.EventService },
+        about: {
+            id: '656038908b1cd5ce629f5992',
+            typeOf: chevre.factory.product.ProductType.EventService
+        },
         creator: { id: 'xxx', typeOf: chevre.factory.personType.Person },
         identifier: 'abcdefgh',
         project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
@@ -27,14 +30,13 @@ async function main() {
     };
     const createResult = await noteRepo.upsertNotesByIdentifier(
         [
-            {
-                $set: creatingNote
-                // $unset: {}
-            },
             {
                 $set: creatingNote
                 // $unset: {}
             }
+            // {
+            //     $set: creatingNote
+            // }
         ],
         { update: false }
     );
@@ -46,6 +48,9 @@ async function main() {
             {
                 $set: creatingNote
             }
+            // {
+            //     $set: creatingNote
+            // }
         ],
         { update: true }
     );

package/example/src/chevre/product/findHasOfferCatalog.ts

@@ -0,0 +1,27 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const productHasOfferCatalogRepo = await chevre.repository.ProductHasOfferCatalog.createInstance(mongoose.connection);
+
+    const offerCatalogs = (await productHasOfferCatalogRepo.findOfferCatalogs(
+        {
+            limit: 10,
+            page: 1,
+            project: { id: { $eq: project.id } },
+            product: { id: { $in: ['656038908b1cd5ce629f5992', '60c1c0031fb182000bed5eff'] } }
+        }
+    ));
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(offerCatalogs, { depth: null });
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/roles/addAdminNotePermissionIfNotExists.ts

@@ -0,0 +1,48 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
+
+    const roleNames = [
+        chevre.factory.role.organizationRole.RoleName.InventoryManager
+        // chevre.factory.role.organizationRole.RoleName.SellersOwner,
+        // chevre.factory.role.organizationRole.RoleName.SellersInventoryManager
+    ];
+    const permissions = [
+        'admin.notes.*'
+    ];
+    for (const roleName of roleNames) {
+        for (const permission of permissions) {
+            const result = await roleRepo.addPermissionIfNotExists({
+                roleName: { $eq: roleName },
+                permission
+            });
+            console.log('permission added.', result, roleName);
+        }
+    }
+
+    // roleNames = [
+    //     chevre.factory.role.organizationRole.RoleName.TicketClerk
+    // ];
+    // permissions = [
+    //     'admin.sellers.productOffers.read'
+    // ];
+    // for (const roleName of roleNames) {
+    //     for (const permission of permissions) {
+    //         const result = await roleRepo.addPermissionIfNotExists({
+    //             roleName: { $eq: roleName },
+    //             permission
+    //         });
+    //         console.log('permission added.', result, roleName);
+    //     }
+    // }
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/roles/{addAdminProductOfferPermissionIfNotExists.ts → addAdminProductReadPermissionIfNotExists.ts}

@@ -8,29 +8,14 @@ async function main() {
 
     const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
 
-    let roleNames = [
+    const roleNames = [
         chevre.factory.role.organizationRole.RoleName.InventoryManager,
         chevre.factory.role.organizationRole.RoleName.SellersOwner,
-        chevre.factory.role.organizationRole.RoleName.SellersInventoryManager
-    ];
-    let permissions = [
-        'admin.sellers.productOffers.*'
-    ];
-    for (const roleName of roleNames) {
-        for (const permission of permissions) {
-            const result = await roleRepo.addPermissionIfNotExists({
-                roleName: { $eq: roleName },
-                permission
-            });
-            console.log('permission added.', result, roleName);
-        }
-    }
-
-    roleNames = [
+        chevre.factory.role.organizationRole.RoleName.SellersInventoryManager,
         chevre.factory.role.organizationRole.RoleName.TicketClerk
     ];
-    permissions = [
-        'admin.sellers.productOffers.read'
+    const permissions = [
+        'admin.products.read'
     ];
     for (const roleName of roleNames) {
         for (const permission of permissions) {
@@ -41,6 +26,22 @@ async function main() {
             console.log('permission added.', result, roleName);
         }
     }
+
+    // roleNames = [
+    //     chevre.factory.role.organizationRole.RoleName.TicketClerk
+    // ];
+    // permissions = [
+    //     'admin.sellers.productOffers.read'
+    // ];
+    // for (const roleName of roleNames) {
+    //     for (const permission of permissions) {
+    //         const result = await roleRepo.addPermissionIfNotExists({
+    //             roleName: { $eq: roleName },
+    //             permission
+    //         });
+    //         console.log('permission added.', result, roleName);
+    //     }
+    // }
 }
 
 main()

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -9,18 +9,16 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
+    const noteRepo = await chevre.repository.NoteAboutOrder.createInstance(mongoose.connection);
 
     let updateResult: any;
 
-    updateResult = await eventRepo.unsetUnnecessaryFields({
+    updateResult = await noteRepo.unsetUnnecessaryFields({
         filter: {
-            // 'project.id': { $eq: '*' }
-            // 'location.maximumAttendeeCapacity': { $exists: true },
-            maximumPhysicalAttendeeCapacity: { $exists: true }
+            'about.identifier': { $exists: true }
         },
-        $unset: <any>{
-            'location.maximumAttendeeCapacity': 1
+        $unset: {
+            'about.identifier': 1
         }
     });
     console.log(updateResult);

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

@@ -3,11 +3,11 @@ import * as factory from '../../../factory';
 type IDocTypeAsEventSeries = factory.eventSeries.IAttributes & {
     _id: string;
 };
-export type IDocType = IDocTypeAsEventSeries;
+type IDocType = IDocTypeAsEventSeries;
 type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "EventSeries";
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
 declare function createSchema(): ISchema;
-export { createSchema, IModel, indexes, modelName };
+export { createSchema, IDocType, IModel, indexes, modelName };

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

@@ -9,30 +9,21 @@ 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
-    },
+    project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    organizer: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     _id: String,
-    typeOf: {
-        type: String,
-        required: true
-    },
+    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: Date,
+    endDate: { type: Date, required: true }, // required(2025-10-08~)
     eventStatus: String,
     headline: mongoose_1.SchemaTypes.Mixed,
     location: mongoose_1.SchemaTypes.Mixed,
-    startDate: Date,
+    startDate: { type: Date, required: true }, // required(2025-10-08~)
     workPerformed: mongoose_1.SchemaTypes.Mixed,
     videoFormat: mongoose_1.SchemaTypes.Mixed,
     soundFormat: mongoose_1.SchemaTypes.Mixed,

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

@@ -85,6 +85,15 @@ const indexes = [
     [
         { identifier: 1, dateCreated: -1 },
         { name: 'identifier' }
+    ],
+    [
+        { 'hasDigitalDocumentPermission.grantee.audienceType': 1, dateCreated: -1 },
+        {
+            name: 'permissionGranteeAudienceType',
+            partialFilterExpression: {
+                'hasDigitalDocumentPermission.grantee.audienceType': { $exists: true }
+            }
+        }
     ]
     // discontinue(2025-05-08~)
     // [

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

@@ -1,8 +1,8 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import * as factory from '../../../factory';
-export type IDocTypeAsProduct = Omit<factory.product.IProduct, 'id'>;
-export interface IDocTypeAsProductOffer {
-    offers?: factory.product.IOffer[];
+type IDocTypeAsProduct = Omit<factory.product.IProduct, 'id'>;
+interface IDocTypeAsProductOffer {
+    offers?: never;
 }
 type IDocType = IDocTypeAsProduct & IDocTypeAsProductOffer;
 type IModel = Model<IDocType>;
@@ -11,4 +11,4 @@ type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocT
 declare const modelName = "Product";
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
 declare function createSchema(): ISchema;
-export { createSchema, IModel, indexes, modelName };
+export { createSchema, IDocTypeAsProduct, IDocTypeAsProductOffer, IModel, indexes, modelName };

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

@@ -8,14 +8,14 @@ const settings_1 = require("../../../settings");
 const modelName = 'Product';
 exports.modelName = modelName;
 const schemaDefinition = {
-    project: mongoose_1.SchemaTypes.Mixed,
+    project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     typeOf: { type: String, required: true },
     additionalProperty: [mongoose_1.SchemaTypes.Mixed],
     availableChannel: mongoose_1.SchemaTypes.Mixed,
     description: mongoose_1.SchemaTypes.Mixed,
     hasOfferCatalog: mongoose_1.SchemaTypes.Mixed,
     name: mongoose_1.SchemaTypes.Mixed,
-    offers: [mongoose_1.SchemaTypes.Mixed],
+    // offers: [SchemaTypes.Mixed], // discontinue(2025-10-15~)
     productID: { type: String, required: true },
     // provider: [SchemaTypes.Mixed], // 廃止(2024-04-12~)
     serviceOutput: mongoose_1.SchemaTypes.Mixed,

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

@@ -15,6 +15,8 @@ export declare class NoteRepo {
     })[]>;
     /**
      * メモ識別子をキーにして冪等置換
+     * 主題+識別子でユニーク必須
+     * 編集の場合、存在検証される
      */
     upsertNotesByIdentifier(params: {
         $set: Pick<INoteDigitalDocument, 'about' | 'creator' | 'identifier' | 'project' | 'provider' | 'text' | 'version' | 'hasDigitalDocumentPermission'> & {
@@ -32,15 +34,6 @@ export declare class NoteRepo {
             id: string;
         }[];
     } | void>;
-    /**
-     * 既知のメモIDリストからメモを削除する
-     */
-    deleteNotesByIds(params: {
-        project: {
-            id: string;
-        };
-        ids: string[];
-    }): Promise<DeleteResult | void>;
     /**
      * 主題リソースから全メモを削除する
      */

package/lib/chevre/repo/note.js

@@ -35,7 +35,7 @@ class NoteRepo {
         this.noteModel = connection.model(note_1.modelName, (0, note_1.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
         const andConditions = [];
         const idIn = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$in;
         if (Array.isArray(idIn)) {
@@ -77,6 +77,10 @@ class NoteRepo {
         if (Array.isArray(identifierIn)) {
             andConditions.push({ identifier: { $in: identifierIn } });
         }
+        const audienceTypeEq = (_v = (_u = (_t = params.hasDigitalDocumentPermission) === null || _t === void 0 ? void 0 : _t.grantee) === null || _u === void 0 ? void 0 : _u.audienceType) === null || _v === void 0 ? void 0 : _v.$eq;
+        if (typeof audienceTypeEq === 'string') {
+            andConditions.push({ 'hasDigitalDocumentPermission.grantee.audienceType': { $exists: true, $eq: audienceTypeEq } });
+        }
         return andConditions;
     }
     findNotes(params, inclusion) {
@@ -107,25 +111,33 @@ class NoteRepo {
     }
     /**
      * メモ識別子をキーにして冪等置換
+     * 主題+識別子でユニーク必須
+     * 編集の場合、存在検証される
      */
+    // tslint:disable-next-line:max-func-body-length
     upsertNotesByIdentifier(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const now = new Date();
             const { update } = options;
             const bulkWriteOps = [];
             const queryFilters = [];
+            let uniqueIdentifiers = [];
             if (Array.isArray(params)) {
                 params.forEach(({ $set }) => {
                     const { about, creator, identifier, project, provider, text, version, hasDigitalDocumentPermission } = $set;
-                    if (typeof identifier !== 'string' || identifier.length === 0) {
+                    if (typeof about.id !== 'string' || about.id === '') {
+                        throw new factory.errors.ArgumentNull('about.id');
+                    }
+                    if (typeof identifier !== 'string' || identifier === '') {
                         throw new factory.errors.ArgumentNull('identifier');
                     }
-                    if (typeof version !== 'string' || version.length === 0) {
+                    if (typeof version !== 'string' || version === '') {
                         throw new factory.errors.ArgumentNull('version');
                     }
                     if (typeof text !== 'string') {
                         throw new factory.errors.ArgumentNull('text');
                     }
+                    uniqueIdentifiers.push(`${about.id}:${identifier}`);
                     // リソースのユニークネスを保証するfilter
                     const filter = {
                         'project.id': { $eq: project.id },
@@ -167,6 +179,25 @@ class NoteRepo {
                 });
             }
             if (bulkWriteOps.length > 0) {
+                // 主題+識別子でユニーク検証
+                uniqueIdentifiers = [...new Set(uniqueIdentifiers)];
+                if (uniqueIdentifiers.length !== bulkWriteOps.length) {
+                    throw new factory.errors.Argument('identifier', '(about.id + identifier)s must be unique');
+                }
+                if (update === true) {
+                    // 編集の場合、存在検証
+                    const modifyingNotes = yield this.noteModel.find({ $or: queryFilters }, {
+                        _id: 0,
+                        id: { $toString: '$_id' }
+                    })
+                        .lean()
+                        .exec();
+                    // tslint:disable-next-line:no-console
+                    console.log('NoteRepo.upsertNotesByIdentifier:', params.length, 'params ->', modifyingNotes.length, 'modifyingNotes found.', JSON.stringify(modifyingNotes));
+                    if (modifyingNotes.length !== bulkWriteOps.length) {
+                        throw new factory.errors.NotFound(factory.creativeWorkType.NoteDigitalDocument);
+                    }
+                }
                 const bulkWriteResult = yield this.noteModel.bulkWrite(bulkWriteOps, { ordered: false });
                 // modifiedの場合upsertedIdsに含まれないので、idを検索する
                 const modifiedNotes = yield this.noteModel.find({ $or: queryFilters }, {
@@ -179,21 +210,24 @@ class NoteRepo {
             }
         });
     }
-    /**
-     * 既知のメモIDリストからメモを削除する
-     */
-    deleteNotesByIds(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { project, ids } = params;
-            if (Array.isArray(ids) && ids.length > 0) {
-                return this.noteModel.deleteMany({
-                    'project.id': { $eq: project.id },
-                    _id: { $in: ids }
-                })
-                    .exec();
-            }
-        });
-    }
+    // /**
+    //  * 既知のメモIDリストからメモを削除する
+    //  */
+    // public async deleteNotesByIds(params: {
+    //     project: { id: string };
+    //     ids: string[];
+    // }): Promise<DeleteResult | void> {
+    //     const { project, ids } = params;
+    //     if (Array.isArray(ids) && ids.length > 0) {
+    //         return this.noteModel.deleteMany(
+    //             {
+    //                 'project.id': { $eq: project.id },
+    //                 _id: { $in: ids }
+    //             }
+    //         )
+    //             .exec();
+    //     }
+    // }
     /**
      * 主題リソースから全メモを削除する
      */

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

@@ -26,5 +26,9 @@ export declare class NoteAboutOrderRepo {
         id: string;
         attributes: Pick<INoteAboutOrder, 'text' | 'editor'>;
     }): Promise<void>;
+    unsetUnnecessaryFields(params: {
+        filter: FilterQuery<factory.creativeWork.noteDigitalDocument.INoteAboutOrder>;
+        $unset: any;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
 }
 export {};

package/lib/chevre/repo/noteAboutOrder.js

@@ -175,5 +175,22 @@ class NoteAboutOrderRepo {
             }
         });
     }
+    // public getCursor(conditions: FilterQuery<factory.creativeWork.noteDigitalDocument.INoteAboutOrder>, projection: any) {
+    //     return this.noteModel.find(
+    //         {
+    //             ...conditions,
+    //             'about.typeOf': { $eq: factory.order.OrderType.Order }
+    //         },
+    //         projection
+    //     )
+    //         .sort({ dateCreated: factory.sortType.Ascending })
+    //         .cursor();
+    // }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.noteModel.updateMany(Object.assign(Object.assign({}, params.filter), { 'about.typeOf': { $eq: factory.order.OrderType.Order } }), { $unset: params.$unset }, { timestamps: false })
+                .exec();
+        });
+    }
 }
 exports.NoteAboutOrderRepo = NoteAboutOrderRepo;

package/lib/chevre/repo/product.js

@@ -48,7 +48,7 @@ class ProductRepo {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
         // MongoDB検索条件
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -111,15 +111,16 @@ class ProductRepo {
                 productID: { $regex: new RegExp(productIDRegex) }
             });
         }
-        const offersElemMatch = (_m = params.offers) === null || _m === void 0 ? void 0 : _m.$elemMatch;
-        if (offersElemMatch !== undefined && offersElemMatch !== null) {
-            andConditions.push({
-                offers: {
-                    $elemMatch: offersElemMatch
-                }
-            });
-        }
-        const serviceOutputTypeOfEq = (_p = (_o = params.serviceOutput) === null || _o === void 0 ? void 0 : _o.typeOf) === null || _p === void 0 ? void 0 : _p.$eq;
+        // discontinue product.offers
+        // const offersElemMatch = params.offers?.$elemMatch;
+        // if (offersElemMatch !== undefined && offersElemMatch !== null) {
+        //     andConditions.push({
+        //         offers: {
+        //             $elemMatch: offersElemMatch
+        //         }
+        //     });
+        // }
+        const serviceOutputTypeOfEq = (_o = (_m = params.serviceOutput) === null || _m === void 0 ? void 0 : _m.typeOf) === null || _o === void 0 ? void 0 : _o.$eq;
         if (typeof serviceOutputTypeOfEq === 'string') {
             andConditions.push({
                 'serviceOutput.typeOf': {
@@ -128,7 +129,7 @@ class ProductRepo {
                 }
             });
         }
-        const serviceOutputAmountCurrencyEq = (_s = (_r = (_q = params.serviceOutput) === null || _q === void 0 ? void 0 : _q.amount) === null || _r === void 0 ? void 0 : _r.currency) === null || _s === void 0 ? void 0 : _s.$eq;
+        const serviceOutputAmountCurrencyEq = (_r = (_q = (_p = params.serviceOutput) === null || _p === void 0 ? void 0 : _p.amount) === null || _q === void 0 ? void 0 : _q.currency) === null || _r === void 0 ? void 0 : _r.$eq;
         if (typeof serviceOutputAmountCurrencyEq === 'string') {
             andConditions.push({
                 'serviceOutput.amount.currency': {
@@ -137,7 +138,7 @@ class ProductRepo {
                 }
             });
         }
-        const serviceTypeCodeValueEq = (_u = (_t = params.serviceType) === null || _t === void 0 ? void 0 : _t.codeValue) === null || _u === void 0 ? void 0 : _u.$eq;
+        const serviceTypeCodeValueEq = (_t = (_s = params.serviceType) === null || _s === void 0 ? void 0 : _s.codeValue) === null || _t === void 0 ? void 0 : _t.$eq;
         if (typeof serviceTypeCodeValueEq === 'string') {
             andConditions.push({
                 'serviceType.codeValue': {
@@ -146,7 +147,7 @@ class ProductRepo {
                 }
             });
         }
-        const nameRegex = (_v = params.name) === null || _v === void 0 ? void 0 : _v.$regex;
+        const nameRegex = (_u = params.name) === null || _u === void 0 ? void 0 : _u.$regex;
         if (typeof nameRegex === 'string' && nameRegex.length > 0) {
             const nameRegexExp = new RegExp(nameRegex);
             andConditions.push({
@@ -156,7 +157,7 @@ class ProductRepo {
                 ]
             });
         }
-        const additionalPropertyElemMatchNameEq = (_w = params.additionalPropertyMatch) === null || _w === void 0 ? void 0 : _w.nameEq;
+        const additionalPropertyElemMatchNameEq = (_v = params.additionalPropertyMatch) === null || _v === void 0 ? void 0 : _v.nameEq;
         if (typeof additionalPropertyElemMatchNameEq === 'string') {
             andConditions.push({
                 additionalProperty: {

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

@@ -0,0 +1,43 @@
+import { Connection } from 'mongoose';
+import * as factory from '../factory';
+interface IOfferCatalogAsFindResult {
+    /**
+     * カタログID
+     */
+    id: string;
+    /**
+     * 対象オファー
+     */
+    aggregateElement: {
+        itemOffered: {
+            /**
+             * プロダクトID
+             */
+            id: string;
+            typeOf: factory.product.ProductType;
+        };
+    };
+}
+/**
+ * プロダクトオファーカタログリポジトリ
+ */
+export declare class ProductHasOfferCatalogRepo {
+    private readonly productModel;
+    constructor(connection: Connection);
+    findOfferCatalogs(params: {
+        limit?: number;
+        page?: number;
+        project?: {
+            id?: {
+                $eq?: string;
+            };
+        };
+        product?: {
+            id?: {
+                $eq?: string;
+                $in?: string[];
+            };
+        };
+    }): Promise<IOfferCatalogAsFindResult[]>;
+}
+export {};

package/lib/chevre/repo/productHasOfferCatalog.js

@@ -0,0 +1,71 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProductHasOfferCatalogRepo = void 0;
+const mongoose_1 = require("mongoose");
+const factory = require("../factory");
+const settings_1 = require("../settings");
+const product_1 = require("./mongoose/schemas/product");
+/**
+ * プロダクトオファーカタログリポジトリ
+ */
+class ProductHasOfferCatalogRepo {
+    constructor(connection) {
+        this.productModel = connection.model(product_1.modelName, (0, product_1.createSchema)());
+    }
+    findOfferCatalogs(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f;
+            const matchStages = [];
+            const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+            if (typeof projectIdEq === 'string') {
+                matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
+            }
+            const productIdEq = (_d = (_c = params.product) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
+            if (typeof productIdEq === 'string') {
+                matchStages.push({ $match: { _id: { $eq: new mongoose_1.Types.ObjectId(productIdEq) } } });
+            }
+            const productIdIn = (_f = (_e = params.product) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$in;
+            if (Array.isArray(productIdIn)) {
+                matchStages.push({ $match: { _id: { $in: productIdIn.map((productId) => new mongoose_1.Types.ObjectId(productId)) } } });
+            }
+            const aggregate = this.productModel.aggregate([
+                {
+                    $unwind: {
+                        path: '$hasOfferCatalog.itemListElement'
+                    }
+                },
+                ...matchStages,
+                { $sort: { productID: factory.sortType.Ascending } },
+                {
+                    $project: {
+                        _id: 0,
+                        id: '$hasOfferCatalog.itemListElement.id',
+                        aggregateElement: {
+                            itemOffered: {
+                                id: { $toString: '$_id' },
+                                typeOf: '$typeOf'
+                            }
+                        }
+                    }
+                }
+            ]);
+            if (typeof params.limit === 'number' && params.limit > 0) {
+                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+                aggregate.skip(params.limit * (page - 1))
+                    .limit(params.limit);
+            }
+            return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
+}
+exports.ProductHasOfferCatalogRepo = ProductHasOfferCatalogRepo;

package/lib/chevre/repository.d.ts

@@ -56,6 +56,7 @@ import type { SectionRepo } from './repo/place/section';
 import type { PotentialActionRepo } from './repo/potentialAction';
 import type { PriceSpecificationRepo } from './repo/priceSpecification';
 import type { ProductRepo } from './repo/product';
+import type { ProductHasOfferCatalogRepo } from './repo/productHasOfferCatalog';
 import type { ProductModelRepo } from './repo/productModel';
 import type { ProductOfferRepo } from './repo/productOffer';
 import type { ProjectRepo } from './repo/project';
@@ -348,6 +349,10 @@ export type Product = ProductRepo;
 export declare namespace Product {
     function createInstance(...params: ConstructorParameters<typeof ProductRepo>): Promise<ProductRepo>;
 }
+export type ProductHasOfferCatalog = ProductHasOfferCatalogRepo;
+export declare namespace ProductHasOfferCatalog {
+    function createInstance(...params: ConstructorParameters<typeof ProductHasOfferCatalogRepo>): Promise<ProductHasOfferCatalogRepo>;
+}
 export type ProductModel = ProductModelRepo;
 export declare namespace ProductModel {
     function createInstance(...params: ConstructorParameters<typeof ProductModelRepo>): Promise<ProductModelRepo>;

package/lib/chevre/repository.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Permit = exports.Person = exports.paymentMethod = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AdvanceBookingRequirement = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
-exports.WebSite = exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = void 0;
+exports.WebSite = exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -802,6 +802,19 @@ var Product;
     }
     Product.createInstance = createInstance;
 })(Product || (exports.Product = Product = {}));
+var ProductHasOfferCatalog;
+(function (ProductHasOfferCatalog) {
+    let repo;
+    function createInstance(...params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (repo === undefined) {
+                repo = (yield Promise.resolve().then(() => require('./repo/productHasOfferCatalog'))).ProductHasOfferCatalogRepo;
+            }
+            return new repo(...params);
+        });
+    }
+    ProductHasOfferCatalog.createInstance = createInstance;
+})(ProductHasOfferCatalog || (exports.ProductHasOfferCatalog = ProductHasOfferCatalog = {}));
 var ProductModel;
 (function (ProductModel) {
     let repo;

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest.js

@@ -20,6 +20,7 @@ function verifyOfferedByToken(params) {
         try {
             result = yield new Promise((resolve, reject) => {
                 jwt.verify(token, secret, {
+                    algorithms: ['HS256'],
                     issuer
                     // ...(Array.isArray(params.audience)) ? { audience: params.audience } : undefined
                 }, (err, decoded) => {

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

@@ -160,7 +160,8 @@ function createInformTasks(params, setting) {
             );
             // 最適化(2024-03-25~)
             events4inform = screeningEventSeries4inform.map(({ project, organizer, typeOf, name, location, id, videoFormat, soundFormat, workPerformed, kanaName, eventStatus, endDate, startDate, additionalProperty, subtitleLanguage, dubLanguage, alternativeHeadline, description, duration, headline }) => {
-                return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ project, organizer, typeOf, name, location, id, videoFormat, soundFormat, workPerformed, kanaName, eventStatus }, (endDate !== undefined) ? { endDate } : undefined), (startDate !== undefined) ? { startDate } : undefined), (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (subtitleLanguage !== undefined) ? {} : undefined), (dubLanguage !== undefined) ? { dubLanguage } : undefined), (alternativeHeadline !== undefined) ? { alternativeHeadline } : undefined), (description !== undefined) ? { description } : undefined), (typeof duration === 'string') ? { duration } : undefined), (headline !== undefined) ? { headline } : undefined);
+                return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ project, organizer, typeOf, name, location, id, videoFormat, soundFormat, workPerformed, kanaName, eventStatus,
+                    endDate, startDate }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (subtitleLanguage !== undefined) ? {} : undefined), (dubLanguage !== undefined) ? { dubLanguage } : undefined), (alternativeHeadline !== undefined) ? { alternativeHeadline } : undefined), (description !== undefined) ? { description } : undefined), (typeof duration === 'string') ? { duration } : undefined), (headline !== undefined) ? { headline } : undefined);
             });
         }
         if (events4inform.length > 0) {

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

@@ -4,105 +4,7 @@ exports.tour2creatingEvent = tour2creatingEvent;
 exports.schedule2tours = schedule2tours;
 const moment = require("moment-timezone");
 const factory = require("../../../../factory");
-// tslint:disable-next-line:max-func-body-length
-// function schedule2createEventParams(
-//     schedule: factory.schedule.IEventWithSchedule,
-//     createDate: Date
-// ): factory.event.screeningEvent.ICreateParams[] {
-//     const eventServiceId = schedule.offers?.itemOffered?.id;
-//     const makesOffer = schedule.offers?.seller?.makesOffer;
-//     const applicationIds: string[] = (Array.isArray(makesOffer))
-//         ? makesOffer.map(({ availableAtOrFrom }) => availableAtOrFrom.id)
-//         : [];
-//     const eventSeriesId = schedule.superEvent?.id;
-//     if (typeof eventServiceId !== 'string' || eventServiceId === '') {
-//         throw new factory.errors.NotFound('schedule.offers.itemOffered.id');
-//     }
-//     if (typeof eventSeriesId !== 'string' || eventSeriesId === '') {
-//         throw new factory.errors.NotFound('schedule.superEvent.id');
-//     }
-//     // 引数情報取得
-//     if (schedule.eventSchedule === undefined) {
-//         throw new factory.errors.NotFound('eventSchedule');
-//     }
-//     const targetInfo = getTargetInfoByEventWithSchedule(schedule, createDate);
-//     debug(targetInfo.length, 'targetInfos ->', targetInfo);
-//     const createParams: factory.event.screeningEvent.ICreateParams[] = [];
-//     for (const performanceInfo of targetInfo) {
-//         const oldEventId = [
-//             // tslint:disable-next-line:no-magic-numbers
-//             performanceInfo.day.slice(-6),
-//             workPerformedIdentifier,
-//             movieTheater.branchCode,
-//             screeningRoom.branchCode,
-//             performanceInfo.start_time
-//         ].join('');
-//         const maxValue = movieTheater.offers?.eligibleQuantity?.maxValue;
-//         const availabilityEnds: Date = moment(performanceInfo.end_date)
-//             .tz('Asia/Tokyo')
-//             .endOf('date')
-//             .toDate();
-//         const availabilityStarts: Date = moment(performanceInfo.start_date)
-//             .tz('Asia/Tokyo')
-//             .startOf('date')
-//             // tslint:disable-next-line:no-magic-numbers
-//             .add(-3, 'months')
-//             .toDate();
-//         const validThrough: Date = moment(performanceInfo.end_date)
-//             .tz('Asia/Tokyo')
-//             .endOf('date')
-//             .toDate();
-//         const validFrom: Date = moment(performanceInfo.start_date)
-//             .tz('Asia/Tokyo')
-//             .startOf('date')
-//             // tslint:disable-next-line:no-magic-numbers
-//             .add(-3, 'months')
-//             .toDate();
-//         // イベント作成
-//         createParams.push({
-//             eventStatus: factory.eventStatusType.EventScheduled,
-//             doorTime: performanceInfo.door_time,
-//             startDate: performanceInfo.start_date,
-//             endDate: performanceInfo.end_date,
-//             offers: {
-//                 eligibleQuantity: {
-//                     ...(typeof maxValue === 'number') ? { maxValue } : undefined // ひとまず全座席予約可能なように
-//                 },
-//                 itemOffered: {
-//                     // 興行ID追加(2022-09-01~)
-//                     id: eventServiceId,
-//                     serviceOutput: {
-//                         typeOf: factory.reservationType.EventReservation,
-//                         reservedTicket: {
-//                             typeOf: 'Ticket',
-//                             ticketedSeat: { typeOf: factory.placeType.Seat }
-//                         }
-//                     },
-//                 },
-//                 seller: {
-//                     // event.offersにseller.makesOfferを追加(2022-11-18~)
-//                     makesOffer: applicationIds.map((applicationId) => {
-//                         return {
-//                             typeOf: factory.offerType.Offer,
-//                             availableAtOrFrom: { id: applicationId }, // support no-array(2024-10-13~),
-//                             availabilityEnds,
-//                             availabilityStarts,
-//                             validFrom,
-//                             validThrough
-//                         };
-//                     })
-//                 }
-//             },
-//             // 旧フォーマットIDを追加特性に追加(2022-09-08~)
-//             additionalProperty: [
-//                 { name: 'tourNumber', value: String(performanceInfo.tour_number) },
-//                 { name: 'oldEventId', value: oldEventId }
-//             ],
-//             identifier: oldEventId
-//         });
-//     }
-//     return createParams;
-// }
+const TIMEZONE = 'Asia/Tokyo';
 // tslint:disable-next-line:max-func-body-length
 function tour2creatingEvent(tour, movieTheater, screeningRoom, existingApplicationMembers, maxValue, eventService, screeningEventSeries, project) {
     var _a;
@@ -115,22 +17,34 @@ function tour2creatingEvent(tour, movieTheater, screeningRoom, existingApplicati
         screeningRoom.branchCode,
         tour.start_time
     ].join('');
+    // 00:00:00で再実装(2025-10-09~)
+    // const availabilityEnds: Date = moment(tour.end_date)
+    //     .tz(TIMEZONE)
+    //     .endOf('date')
+    //     .toDate();
     const availabilityEnds = moment(tour.end_date)
-        .tz('Asia/Tokyo')
-        .endOf('date')
+        .tz(TIMEZONE)
+        .startOf('date')
+        .add(1, 'day')
         .toDate();
     const availabilityStarts = moment(tour.start_date)
-        .tz('Asia/Tokyo')
+        .tz(TIMEZONE)
         .startOf('date')
         // tslint:disable-next-line:no-magic-numbers
         .add(-3, 'months')
         .toDate();
+    // 00:00:00で再実装(2025-10-09~)
+    // const validThrough: Date = moment(tour.end_date)
+    //     .tz(TIMEZONE)
+    //     .endOf('date')
+    //     .toDate();
     const validThrough = moment(tour.end_date)
-        .tz('Asia/Tokyo')
-        .endOf('date')
+        .tz(TIMEZONE)
+        .startOf('date')
+        .add(1, 'day')
         .toDate();
     const validFrom = moment(tour.start_date)
-        .tz('Asia/Tokyo')
+        .tz(TIMEZONE)
         .startOf('date')
         // tslint:disable-next-line:no-magic-numbers
         .add(-3, 'months')

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.0.0-alpha.1",
-    "@cinerino/sdk": "12.5.0-alpha.1",
+    "@chevre/factory": "5.1.0-alpha.3",
+    "@cinerino/sdk": "12.5.0-alpha.9",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
     "@sendgrid/client": "8.1.4",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.0.0-alpha.1"
+  "version": "23.0.0-alpha.10"
 }

package/example/src/chevre/unsetUnnecessaryFieldsInAction.ts

@@ -1,50 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const DAYS = 365;
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const now = new Date();
-    let updateResult: any;
-
-    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
-
-    const startIndex = 8760;
-    // tslint:disable-next-line:no-magic-numbers
-    const hours = (DAYS * 24) + startIndex;
-    // tslint:disable-next-line:no-increment-decrement no-magic-numbers
-    for (let index = startIndex; index < hours; index++) {
-        // for (let index = 0; index < hours; index++) {
-        updateResult = await actionRepo.unsetUnnecessaryFields({
-            filter: {
-                // _id: { $eq: '667379e7be9a532411c29424' },
-                typeOf: { $eq: chevre.factory.actionType.CheckAction },
-                'object.typeOf': { $exists: true, $eq: chevre.factory.service.paymentService.PaymentServiceType.MovieTicket },
-                actionStatus: { $eq: chevre.factory.actionStatusType.CompletedActionStatus },
-                startDate: {
-                    $gte: moment(now)
-                        .add(-(index + 1), 'hours')
-                        .toDate(),
-                    $lt: moment(now)
-                        .add(-index, 'hours')
-                        .toDate()
-                }
-            },
-            $unset: {
-                'result.purchaseNumberAuthIn': 1,
-                'result.purchaseNumberAuthResult': 1
-            }
-        });
-        console.log('unset processed.', updateResult, -(index + 1), 'hours', -index, 'hours');
-    }
-
-    console.log(DAYS, 'days processed');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/unsetUnnecessaryFieldsInTransaction.ts

@@ -1,46 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const DAYS = 500;
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const now = new Date();
-    let updateResult: any;
-
-    const transactionRepo = await chevre.repository.Transaction.createInstance(mongoose.connection);
-
-    // tslint:disable-next-line:no-magic-numbers
-    const hours = DAYS * 24;
-    // tslint:disable-next-line:no-increment-decrement no-magic-numbers
-    for (let index = 0; index < hours; index++) {
-        updateResult = await transactionRepo.unsetUnnecessaryFields({
-            filter: {
-                // _id: { $eq: '649a7654ff1c885bcc40bbb7' },
-                typeOf: { $eq: chevre.factory.transactionType.PlaceOrder },
-                status: { $eq: chevre.factory.transactionStatusType.Confirmed },
-                startDate: {
-                    $gte: moment(now)
-                        .add(-(index + 1), 'hours')
-                        .toDate(),
-                    $lt: moment(now)
-                        .add(-index, 'hours')
-                        .toDate()
-                }
-            },
-            $unset: {
-                'result.order.acceptedOffers': 1
-            }
-        });
-        console.log('unset processed.', updateResult, -(index + 1), 'hours', -index, 'hours');
-    }
-
-    console.log(DAYS, 'days processed');
-}
-
-main()
-    .then()
-    .catch(console.error);