@chevre/domain 28.0.0-alpha.31 → 28.0.0-alpha.33

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

@@ -1,6 +1,5 @@
 import type { Connection } from 'mongoose';
-import { factory } from '../factory';
-import { IModel } from './mongoose/schemas/accountTitle';
+import { IDocType, IModel } from './mongoose/schemas/accountTitle';
 /**
  * 科目リポジトリ
  */
@@ -12,11 +11,11 @@ export declare class AccountTitleRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, factory.accountTitle.IAccountTitle, import("./mongoose/virtuals").IVirtuals, {}> & factory.accountTitle.IAccountTitle & {
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & IDocType & {
         _id: import("mongoose").Types.ObjectId;
     } & {
         __v: number;
-    }, import("mongoose").QueryOptions<factory.accountTitle.IAccountTitle>, (import("mongoose").Document<unknown, Record<string, never>, factory.accountTitle.IAccountTitle, import("./mongoose/virtuals").IVirtuals, {}> & factory.accountTitle.IAccountTitle & {
+    }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & IDocType & {
         _id: import("mongoose").Types.ObjectId;
     } & {
         __v: number;

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

@@ -1,7 +1,7 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import { IVirtuals } from '../virtuals';
 import { factory } from '../../../factory';
-type IDocType = factory.accountTitle.IAccountTitle;
+type IDocType = Pick<factory.accountTitle.IAccountTitle, 'additionalProperty' | 'codeValue' | 'hasCategoryCode' | 'name' | 'project' | 'typeOf'>;
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, Record<string, never>, Record<string, never>, IVirtuals, Record<string, never>, ISchemaDefinition, IDocType>;

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

@@ -8,18 +8,15 @@ const settings_1 = require("../../../settings");
 const modelName = 'AccountTitle';
 exports.modelName = modelName;
 const schemaDefinition = {
-    project: mongoose_1.SchemaTypes.Mixed,
-    typeOf: {
-        type: String,
-        required: true
-    },
-    codeValue: String,
+    project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    typeOf: { type: String, required: true },
+    codeValue: { type: String, required: true },
     name: String,
-    inCodeSet: mongoose_1.SchemaTypes.Mixed,
     hasCategoryCode: mongoose_1.SchemaTypes.Mixed,
-    inDefinedTermSet: mongoose_1.SchemaTypes.Mixed,
-    hasDefinedTerm: mongoose_1.SchemaTypes.Mixed,
     additionalProperty: mongoose_1.SchemaTypes.Mixed
+    // inCodeSet: SchemaTypes.Mixed, // discontinue(2026-10-16~)
+    // inDefinedTermSet: SchemaTypes.Mixed, // discontinue(2026-10-16~)
+    // hasDefinedTerm: SchemaTypes.Mixed, // discontinue(2026-10-16~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

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

@@ -3,7 +3,6 @@ import { IVirtuals } from '../virtuals';
 import { factory } from '../../../factory';
 export type IDocType = Omit<factory.offerCatalog.IOfferCatalog, 'id'> & {
     _id: string;
-    alternateName?: any;
     dateSynced?: Date;
 };
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;

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

@@ -10,24 +10,15 @@ exports.modelName = modelName;
 const schemaDefinition = {
     project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     _id: String,
-    identifier: {
-        type: String,
-        required: true
-    },
+    identifier: { type: String, required: true },
     name: mongoose_1.SchemaTypes.Mixed,
     description: mongoose_1.SchemaTypes.Mixed,
-    alternateName: mongoose_1.SchemaTypes.Mixed,
-    typeOf: {
-        type: String,
-        required: true
-    },
+    // alternateName: SchemaTypes.Mixed,
+    typeOf: { type: String, required: true },
     itemListElement: [mongoose_1.SchemaTypes.Mixed],
     itemOffered: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     additionalProperty: [mongoose_1.SchemaTypes.Mixed],
     dateSynced: Date // 追加(2023-09-13~)
-    // createdAt: SchemaTypes.Mixed,
-    // updatedAt: SchemaTypes.Mixed,
-    // __v: SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

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

@@ -1,9 +1,8 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import { IVirtuals } from '../virtuals';
 import { factory } from '../../../factory';
-export type IDocType = Omit<factory.offerCatalog.IOfferCatalog, 'id'> & {
+export type IDocType = Pick<factory.offerCatalog.IOfferCatalog, 'description' | 'identifier' | 'itemListElement' | 'itemOffered' | 'name' | 'project' | 'relatedOffer' | 'typeOf'> & {
     _id: string;
-    alternateName?: any;
     dateSynced?: Date;
 };
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;

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

@@ -9,25 +9,16 @@ const modelName = 'OfferCatalogItem';
 exports.modelName = modelName;
 const schemaDefinition = {
     project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
-    identifier: {
-        type: String,
-        required: true
-    },
-    name: mongoose_1.SchemaTypes.Mixed,
-    description: mongoose_1.SchemaTypes.Mixed,
-    alternateName: mongoose_1.SchemaTypes.Mixed,
-    typeOf: {
-        type: String,
-        required: true
-    },
+    identifier: { type: String, required: true },
+    typeOf: { type: String, required: true },
     itemListElement: [mongoose_1.SchemaTypes.Mixed],
     itemOffered: { type: mongoose_1.SchemaTypes.Mixed, required: true },
-    additionalProperty: [mongoose_1.SchemaTypes.Mixed],
+    name: mongoose_1.SchemaTypes.Mixed,
+    description: mongoose_1.SchemaTypes.Mixed,
+    // alternateName: SchemaTypes.Mixed,
+    // additionalProperty: [SchemaTypes.Mixed], // discontinue(2026-10-15~)
     dateSynced: Date,
     relatedOffer: mongoose_1.SchemaTypes.Mixed
-    // createdAt: SchemaTypes.Mixed,
-    // updatedAt: SchemaTypes.Mixed,
-    // __v: SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

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

@@ -170,7 +170,6 @@ export declare class OfferCatalogRepo {
     }): Promise<void>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.offerCatalog.IOfferCatalog, "id"> & {
         _id: string;
-        alternateName?: any;
         dateSynced?: Date;
     } & Required<{
         _id: string;
@@ -178,7 +177,6 @@ export declare class OfferCatalogRepo {
         __v: number;
     }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.offerCatalog.IOfferCatalog, "id"> & {
         _id: string;
-        alternateName?: any;
         dateSynced?: Date;
     } & Required<{
         _id: string;

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

@@ -1,6 +1,8 @@
 import { Connection, FilterQuery, mongo } from 'mongoose';
 import { factory } from '../factory';
-export type IAggregatedOfferCatalog = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'project' | 'typeOf' | 'identifier' | 'itemOffered' | 'additionalProperty' | 'relatedOffer'> & {
+import { IDocType } from './mongoose/schemas/offerCatalogItem';
+type IOfferCatalogItem = Pick<factory.offerCatalog.IOfferCatalog, 'description' | 'identifier' | 'itemListElement' | 'itemOffered' | 'name' | 'project' | 'relatedOffer' | 'typeOf' | 'id'>;
+export type IAggregatedOfferCatalog = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'project' | 'typeOf' | 'identifier' | 'itemOffered' | 'relatedOffer'> & {
     numberOfItems?: number;
     itemListElementTypeOf: factory.offerType.Offer;
 };
@@ -11,25 +13,25 @@ type IKeyOfProjection = 'name' | 'description' | 'project' | 'typeOf' | 'id' | '
 export declare class OfferCatalogItemRepo {
     private readonly offerCatalogItemModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.offerCatalog.ISearchConditions): any[];
-    save(params: factory.offerCatalog.IOfferCatalog & {
-        $unset?: any;
+    static CREATE_MONGO_CONDITIONS(params: factory.offerCatalog.ISearchConditions): FilterQuery<IDocType>[];
+    save(params: IOfferCatalogItem & {
+        $unset?: Partial<Record<keyof IDocType, 1>>;
     }): Promise<{
         id: string;
     }>;
     /**
      * プロジェクトとコードから冪等保管
      */
-    saveByIdentifier(params: factory.offerCatalog.IOfferCatalog): Promise<{
+    saveByIdentifier(params: IOfferCatalogItem): Promise<{
         id: string;
     }>;
     /**
      * コードをキーにして冪等置換(2023-12-14~)
      */
     upsertManyByIdentifier(params: {
-        $set: factory.offerCatalog.IOfferCatalog;
+        $set: IOfferCatalogItem;
         $unset?: {
-            [key in keyof factory.offerCatalog.IOfferCatalog]?: 1;
+            [key in keyof IDocType]?: 1;
         };
     }[], options: {
         /**
@@ -73,8 +75,8 @@ export declare class OfferCatalogItemRepo {
             };
         };
     }): Promise<void>;
-    count(params: Omit<factory.offerCatalog.ISearchConditions, 'limit' | 'page' | 'sort'>): Promise<number>;
-    projectFields(params: factory.offerCatalog.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IAggregatedOfferCatalog[]>;
+    countOfferCatalogItems(params: Omit<factory.offerCatalog.ISearchConditions, 'limit' | 'page' | 'sort'>): Promise<number>;
+    findOfferCatalogItems(params: factory.offerCatalog.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IAggregatedOfferCatalog[]>;
     findItemListElementById(params: {
         id: string;
         project: {
@@ -118,17 +120,8 @@ export declare class OfferCatalogItemRepo {
         };
     }): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
     unsetUnnecessaryFields(params: {
-        filter: FilterQuery<factory.offerCatalog.IOfferCatalog>;
-        $unset: any;
+        filter: FilterQuery<IDocType>;
+        $unset: Partial<Record<keyof IDocType, 1>>;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
-    aggregateItemList(params: {
-        itemListElement: {
-            typeOf: {
-                $eq: factory.offerType.Offer | 'OfferCatalog';
-            };
-        };
-    }): Promise<{
-        aggregation: any;
-    }>;
 }
 export {};

package/lib/chevre/repo/offerCatalogItem.js

@@ -28,7 +28,7 @@ class OfferCatalogItemRepo {
     }
     static CREATE_MONGO_CONDITIONS(params) {
         // MongoDB検索条件
-        const andConditions = []; // eslint-disable-line @typescript-eslint/no-explicit-any
+        const andConditions = [];
         const projectIdEq = params.project?.id?.$eq;
         if (typeof projectIdEq === 'string') {
             andConditions.push({ 'project.id': { $eq: projectIdEq } });
@@ -247,7 +247,7 @@ class OfferCatalogItemRepo {
         })
             .exec();
     }
-    async count(params) {
+    async countOfferCatalogItems(params) {
         const conditions = OfferCatalogItemRepo.CREATE_MONGO_CONDITIONS(params);
         const matchStages = conditions.map((condition) => {
             return { $match: condition };
@@ -261,18 +261,15 @@ class OfferCatalogItemRepo {
             .exec();
         return (result.length > 0) ? result[0].numItems : 0;
     }
-    async projectFields(params, inclusion) {
+    async findOfferCatalogItems(params, inclusion) {
         const conditions = OfferCatalogItemRepo.CREATE_MONGO_CONDITIONS(params);
         const matchStages = conditions.map((condition) => {
             return { $match: condition };
         });
         let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
-        if (Array.isArray(inclusion) && inclusion.length > 0) {
+        if (Array.isArray(inclusion)) {
             positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
         }
-        else {
-            // throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
-        }
         const projection = {
             _id: 0,
             id: { $toString: '$_id' },
@@ -297,49 +294,6 @@ class OfferCatalogItemRepo {
                 return [key, value];
             }))
         };
-        // let projectStage: { [field: string]: AnyExpression } = {
-        //     _id: 0,
-        //     name: '$name',
-        //     description: '$description',
-        //     project: '$project',
-        //     typeOf: '$typeOf',
-        //     id: { $toString: '$_id' },
-        //     identifier: '$identifier',
-        //     itemOffered: '$itemOffered',
-        //     additionalProperty: '$additionalProperty',
-        //     relatedOffer: '$relatedOffer',
-        //     numberOfItems: {
-        //         $cond: {
-        //             if: { $isArray: '$itemListElement' },
-        //             then: { $size: '$itemListElement' },
-        //             else: 0
-        //         }
-        //     },
-        //     itemListElementTypeOf: { $first: '$itemListElement.typeOf' },
-        //     dateSynced: '$dateSynced'
-        // };
-        // const positiveProjectionFields: string[] = Object.keys(projection)
-        //     .filter((key) => projection[<KeyOfOfferCatalogItem>key] !== 0);
-        // const negativeProjectionFields: string[] = Object.keys(projection)
-        //     .filter((key) => projection[<KeyOfOfferCatalogItem>key] === 0);
-        // if (positiveProjectionFields.length > 0) {
-        //     projectStage = {
-        //         _id: 0,
-        //         id: { $toString: '$_id' }
-        //     };
-        //     positiveProjectionFields.forEach((field) => {
-        //         if (field !== '_id' && field !== 'id') {
-        //             projectStage[field] = `$${field}`;
-        //         }
-        //     });
-        // } else if (negativeProjectionFields.length > 0) {
-        //     negativeProjectionFields.forEach((field) => {
-        //         if (projectStage[field] !== undefined && projectStage[field] !== null) {
-        //             // tslint:disable-next-line:no-dynamic-delete
-        //             delete projectStage[field];
-        //         }
-        //     });
-        // }
         const aggregate = this.offerCatalogItemModel.aggregate([
             ...(params.sort?.identifier !== undefined) ? [{ $sort: { identifier: params.sort.identifier } }] : [],
             ...matchStages,
@@ -347,8 +301,10 @@ class OfferCatalogItemRepo {
         ]);
         if (typeof params.limit === 'number' && params.limit > 0) {
             const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-            aggregate.limit(params.limit * page)
-                .skip(params.limit * (page - 1));
+            // aggregate.limit(params.limit * page)
+            //     .skip(params.limit * (page - 1));
+            aggregate.skip(params.limit * (page - 1))
+                .limit(params.limit);
         }
         return aggregate.exec();
     }
@@ -413,39 +369,5 @@ class OfferCatalogItemRepo {
         return this.offerCatalogItemModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
             .exec();
     }
-    async aggregateItemList(params) {
-        const matchConditions = {
-            'itemListElement.typeOf': { $eq: params.itemListElement.typeOf.$eq }
-        };
-        const aggregations = await this.offerCatalogItemModel.aggregate([
-            { $match: matchConditions },
-            {
-                $project: {
-                    numItemListElement: { $size: '$itemListElement' }
-                }
-            },
-            {
-                $group: {
-                    _id: '$typeOf',
-                    maxNumItemListElement: { $max: '$numItemListElement' },
-                    minNumItemListElement: { $min: '$numItemListElement' }
-                }
-            },
-            {
-                $project: {
-                    _id: 0,
-                    maxNumItemListElement: '$maxNumItemListElement',
-                    minNumItemListElement: '$minNumItemListElement'
-                }
-            }
-        ])
-            .exec();
-        if (aggregations.length === 0) {
-            return {
-                aggregation: {}
-            };
-        }
-        return { aggregation: aggregations[0] };
-    }
 }
 exports.OfferCatalogItemRepo = OfferCatalogItemRepo;

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

@@ -65,7 +65,7 @@ function searchTicketOffersByItemOffered(params) {
             // サブカタログの適用決済カード条件を考慮
             if (isOfferCatalogItem) {
                 // サブカタログ参照
-                const offerCatalogItem = (await repos.offerCatalogItem.projectFields({ id: { $in: [subOfferCatalogId] } }, ['relatedOffer']
+                const offerCatalogItem = (await repos.offerCatalogItem.findOfferCatalogItems({ id: { $in: [subOfferCatalogId] } }, ['relatedOffer']
                 // { relatedOffer: 1 }
                 )).shift();
                 if (offerCatalogItem === undefined) {

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

@@ -63,9 +63,9 @@ function searchOfferCatalogItems(params) {
             });
             if (catalogItemListElements.length > 0) {
                 // サブカタログ検索
-                const searchOfferCatalogItemsResult = await repos.offerCatalogItem.projectFields({
+                const searchOfferCatalogItemsResult = await repos.offerCatalogItem.findOfferCatalogItems({
                     id: { $in: catalogItemListElements.map((element) => element.id) }
-                }, ['description', 'name', 'additionalProperty', 'relatedOffer']);
+                }, ['description', 'name', 'relatedOffer']);
                 offerCatalogItems = catalogItemListElements.map((element) => {
                     const offerCatalogItem = searchOfferCatalogItemsResult.find((item) => item.id === element.id);
                     if (offerCatalogItem === undefined) {

package/lib/chevre/service/task/onResourceUpdated/onOfferCatalogUpdated.js

@@ -13,7 +13,7 @@ function createInformOfferCatalogTasks(params, setting) {
         }
         let offerCatalogs;
         if (params.isOfferCatalogItem) {
-            offerCatalogs = await repos.offerCatalogItem.projectFields({ id: { $in: params.ids } }, ['identifier', 'name', 'numberOfItems', 'project', 'typeOf']);
+            offerCatalogs = await repos.offerCatalogItem.findOfferCatalogItems({ id: { $in: params.ids } }, ['identifier', 'name', 'numberOfItems', 'project', 'typeOf']);
         }
         else {
             offerCatalogs = await repos.offerCatalog.projectFields({ id: { $in: params.ids } }, ['identifier', 'name', 'numberOfItems', 'project', 'typeOf']);

package/lib/chevre/service/task/onResourceUpdated/syncOfferCatalog.js

@@ -25,7 +25,7 @@ function syncOfferCatalog(params) {
             for (const offerCatalogId of params.ids) {
                 let offerCatalogs;
                 if (params.isOfferCatalogItem) {
-                    offerCatalogs = await repos.offerCatalogItem.projectFields({ id: { $in: [offerCatalogId] } }, ['id', 'itemListElementTypeOf']);
+                    offerCatalogs = await repos.offerCatalogItem.findOfferCatalogItems({ id: { $in: [offerCatalogId] } }, ['id', 'itemListElementTypeOf']);
                 }
                 else {
                     offerCatalogs = await repos.offerCatalog.projectFields({ id: { $in: [offerCatalogId] } }, ['id', 'itemListElementTypeOf']);

package/package.json

@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "28.0.0-alpha.31"
+  "version": "28.0.0-alpha.33"
 }