@chevre/domain 24.1.0-alpha.0 → 24.1.0-alpha.2

package/lib/chevre/repo/accountingReport.js

@@ -49,28 +49,30 @@ class AccountingReportRepo {
                 $match: { 'mainEntity.orderDate': { $lte: orderDateLte } }
             });
         }
-        const reservationForStartDateGte = params.order?.acceptedOffers?.itemOffered?.reservationFor?.startDate?.$gte;
-        if (reservationForStartDateGte instanceof Date) {
-            matchStages.push({
-                $match: {
-                    'mainEntity.acceptedOffers.itemOffered.reservationFor.startDate': {
-                        $exists: true,
-                        $gte: reservationForStartDateGte
-                    }
-                }
-            });
-        }
-        const reservationForStartDateLte = params.order?.acceptedOffers?.itemOffered?.reservationFor?.startDate?.$lte;
-        if (reservationForStartDateLte instanceof Date) {
-            matchStages.push({
-                $match: {
-                    'mainEntity.acceptedOffers.itemOffered.reservationFor.startDate': {
-                        $exists: true,
-                        $lte: reservationForStartDateLte
-                    }
-                }
-            });
-        }
+        // discontinue(2026-05-01~)
+        // const reservationForStartDateGte = params.order?.acceptedOffers?.itemOffered?.reservationFor?.startDate?.$gte;
+        // if (reservationForStartDateGte instanceof Date) {
+        //     matchStages.push({
+        //         $match: {
+        //             'mainEntity.acceptedOffers.itemOffered.reservationFor.startDate': {
+        //                 $exists: true,
+        //                 $gte: reservationForStartDateGte
+        //             }
+        //         }
+        //     });
+        // }
+        // discontinue(2026-05-01~)
+        // const reservationForStartDateLte = params.order?.acceptedOffers?.itemOffered?.reservationFor?.startDate?.$lte;
+        // if (reservationForStartDateLte instanceof Date) {
+        //     matchStages.push({
+        //         $match: {
+        //             'mainEntity.acceptedOffers.itemOffered.reservationFor.startDate': {
+        //                 $exists: true,
+        //                 $lte: reservationForStartDateLte
+        //             }
+        //         }
+        //     });
+        // }
         return matchStages;
     }
     async syncMainEntity(params) {

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

@@ -117,15 +117,16 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'mainEntity.acceptedOffers.itemOffered.reservationFor.startDate': 1, 'mainEntity.orderDate': -1 },
-        {
-            name: 'searchByItemOfferedReservationForStartDate',
-            partialFilterExpression: {
-                'mainEntity.acceptedOffers.itemOffered.reservationFor.startDate': { $exists: true }
-            }
-        }
-    ]
+    // discontinue(2026-05-01~)
+    // [
+    //     { 'mainEntity.acceptedOffers.itemOffered.reservationFor.startDate': 1, 'mainEntity.orderDate': -1 },
+    //     {
+    //         name: 'searchByItemOfferedReservationForStartDate',
+    //         partialFilterExpression: {
+    //             'mainEntity.acceptedOffers.itemOffered.reservationFor.startDate': { $exists: true }
+    //         }
+    //     }
+    // ]
 ];
 exports.indexes = indexes;
 /**

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

@@ -40,9 +40,6 @@ export declare class ProjectRepo {
         id: string;
         makesOffer: factory.project.IMakesOffer[];
     }): Promise<void>;
-    activateOptionalAggregationSettings(params: {
-        id: string;
-    }): Promise<void>;
     updateAggregateReservation(params: {
         id: string;
         aggregateReservation?: any;

package/lib/chevre/repo/project.js

@@ -157,16 +157,6 @@ class ProjectRepo {
         }, { projection: { _id: 1 } })
             .exec();
     }
-    async activateOptionalAggregationSettings(params) {
-        await this.projectModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
-            $set: {
-                'settings.useAggregateEntranceGate': true,
-                'settings.useAggregateOffer': true,
-                'settings.useOfferRateLimit': true
-            }
-        }, { projection: { _id: 1 } })
-            .exec();
-    }
     async updateAggregateReservation(params) {
         await this.projectModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
             $set: {

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

@@ -17,7 +17,6 @@ const hasPOS_1 = require("../../repo/place/hasPOS");
 const movieTheater_1 = require("../../repo/place/movieTheater");
 const screeningRoom_1 = require("../../repo/place/screeningRoom");
 const product_1 = require("../../repo/product");
-const productModel_1 = require("../../repo/productModel");
 const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
 const deleteResourcesByAggregateOffer_1 = require("./onResourceDeleted/deleteResourcesByAggregateOffer");
@@ -28,7 +27,7 @@ const deleteResourcesByProduct_1 = require("./onResourceDeleted/deleteResourcesB
 const deleteResourcesByRoom_1 = require("./onResourceDeleted/deleteResourcesByRoom");
 const deleteResourcesBySeller_1 = require("./onResourceDeleted/deleteResourcesBySeller");
 const onHasPOSUpdated_1 = require("./onResourceUpdated/onHasPOSUpdated");
-const syncCategoryCode_1 = require("./onResourceUpdated/syncCategoryCode");
+// import { syncCategoryCode } from './onResourceUpdated/syncCategoryCode';
 const syncOfferCatalog_1 = require("./onResourceUpdated/syncOfferCatalog");
 /**
  * タスク実行関数
@@ -51,7 +50,6 @@ function call(params) {
             paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
             screeningRoom: new screeningRoom_1.ScreeningRoomRepo(connection),
             product: new product_1.ProductRepo(connection),
-            productModel: new productModel_1.ProductModelRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection)
         });
@@ -136,11 +134,12 @@ function onResourceDeleted(params) {
                     break;
                 // 区分削除に対応(2024-04-18~)
                 case 'CategoryCode':
-                    await (0, syncCategoryCode_1.syncCategoryCode)({
-                        project: { id: params.project.id },
-                        ids: params.id,
-                        isDeleted: true
-                    })(repos);
+                    // discontinue sync to productModels(2026-04-30~)
+                    // await syncCategoryCode({
+                    //     project: { id: params.project.id },
+                    //     ids: params.id,
+                    //     isDeleted: true
+                    // })(repos);
                     break;
                 default:
                     // no op

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

@@ -20,11 +20,10 @@ const hasPOS_1 = require("../../repo/place/hasPOS");
 const movieTheater_1 = require("../../repo/place/movieTheater");
 const screeningRoom_1 = require("../../repo/place/screeningRoom");
 const product_1 = require("../../repo/product");
-const productModel_1 = require("../../repo/productModel");
 const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
 const onAggregateOfferUpdated_1 = require("./onResourceUpdated/onAggregateOfferUpdated");
-const onCategoryCodeUpdated_1 = require("./onResourceUpdated/onCategoryCodeUpdated");
+// import { onCategoryCodeUpdated } from './onResourceUpdated/onCategoryCodeUpdated';
 const onHasPOSUpdated_1 = require("./onResourceUpdated/onHasPOSUpdated");
 const onOfferCatalogUpdated_1 = require("./onResourceUpdated/onOfferCatalogUpdated");
 /**
@@ -51,7 +50,6 @@ function call(data) {
             paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
             screeningRoom: new screeningRoom_1.ScreeningRoomRepo(connection),
             product: new product_1.ProductRepo(connection),
-            productModel: new productModel_1.ProductModelRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection)
         });
@@ -170,11 +168,12 @@ function onResourceUpdated(params) {
                     break;
                 // 区分に対応(2024-04-18~)
                 case 'CategoryCode':
-                    await (0, onCategoryCodeUpdated_1.onCategoryCodeUpdated)({
-                        project: { id: params.project.id },
-                        ids: params.id,
-                        isDeleted: false
-                    })(repos);
+                    // discontinue sync to productModels(2026-04-30~)
+                    // await onCategoryCodeUpdated({
+                    //     project: { id: params.project.id },
+                    //     ids: params.id,
+                    //     isDeleted: false
+                    // })(repos);
                     break;
                 default:
                 // no op

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "8.0.0",
+    "@chevre/factory": "8.1.0-alpha.0",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.1.0-alpha.0"
+  "version": "24.1.0-alpha.2"
 }

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

@@ -1,33 +0,0 @@
-import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
-import { IVirtuals } from '../virtuals';
-import { factory } from '../../../factory';
-export interface IProductModel {
-    id: string;
-    project: {
-        id: string;
-        typeOf: factory.organizationType.Project;
-    };
-    typeOf: 'ProductModel';
-    category: Pick<factory.categoryCode.ICategoryCode, 'codeValue' | 'inCodeSet'> & {
-        /**
-         * 区分ID
-         * 削除時同期に必要
-         */
-        id: string;
-    };
-    name: factory.multilingualString;
-    offers: {
-        typeOf: factory.offerType.Offer;
-        eligibleCustomerType?: {
-            codeValue: string;
-        }[];
-    }[];
-}
-type IDocType = Omit<IProductModel, 'id'>;
-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>;
-declare const modelName = "ProductModel";
-declare const indexes: [d: IndexDefinition, o: IndexOptions][];
-declare function createSchema(): ISchema;
-export { createSchema, IDocType, IModel, indexes, modelName };

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

@@ -1,57 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.modelName = exports.indexes = void 0;
-exports.createSchema = createSchema;
-const mongoose_1 = require("mongoose");
-const writeConcern_1 = require("../writeConcern");
-const settings_1 = require("../../../settings");
-const modelName = 'ProductModel';
-exports.modelName = modelName;
-const schemaDefinition = {
-    project: mongoose_1.SchemaTypes.Mixed,
-    typeOf: { type: String, required: true },
-    category: mongoose_1.SchemaTypes.Mixed,
-    name: mongoose_1.SchemaTypes.Mixed,
-    offers: mongoose_1.SchemaTypes.Mixed
-};
-const schemaOptions = {
-    autoIndex: settings_1.MONGO_AUTO_INDEX,
-    autoCreate: false,
-    collection: 'productModels',
-    id: true,
-    read: settings_1.MONGO_READ_PREFERENCE,
-    writeConcern: writeConcern_1.writeConcern,
-    strict: true,
-    strictQuery: false,
-    timestamps: false, // 2024-09-03~
-    versionKey: false, // 2024-09-03~
-    toJSON: {
-        getters: false,
-        virtuals: false,
-        minimize: false,
-        versionKey: false
-    },
-    toObject: {
-        getters: false,
-        virtuals: true,
-        minimize: false,
-        versionKey: false
-    }
-};
-const indexes = [];
-exports.indexes = indexes;
-/**
- * プロダクトモデルスキーマ
- */
-let schema;
-function createSchema() {
-    if (schema === undefined) {
-        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
-        if (settings_1.MONGO_AUTO_INDEX) {
-            indexes.forEach((indexParams) => {
-                schema?.index(...indexParams);
-            });
-        }
-    }
-    return schema;
-}

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

@@ -1,27 +0,0 @@
-import type { Connection } from 'mongoose';
-import { factory } from '../factory';
-/**
- * プロダクトモデルリポジトリ
- */
-export declare class ProductModelRepo {
-    private readonly productModelModel;
-    constructor(connection: Connection);
-    /**
-     * 区分から同期する
-     */
-    upsertByCategory(params: {
-        category: Pick<factory.categoryCode.ICategoryCode, 'codeValue' | 'inCodeSet' | 'name' | 'project'> & {
-            id: string;
-        };
-    }): Promise<{
-        id: string;
-    }>;
-    /**
-     * 区分から削除する
-     */
-    deleteByCategory(params: {
-        category: Pick<factory.categoryCode.ICategoryCode, 'project'> & {
-            id: string;
-        };
-    }): Promise<void>;
-}

package/lib/chevre/repo/productModel.js

@@ -1,170 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProductModelRepo = void 0;
-const factory_1 = require("../factory");
-// import { MONGO_MAX_TIME_MS } from '../settings';
-const productModel_1 = require("./mongoose/schemas/productModel");
-// type IKeyOfProjection = keyof IProductModel | '_id';
-// type ISearchConditions = Pick<factory.product.ISearchConditions, 'id' | 'limit' | 'page' | 'project'> & {
-//     category?: {
-//         codeValue?: { $in?: string[] };
-//         inCodeSet?: { identifier?: { $eq?: string } };
-//     };
-// };
-/**
- * プロダクトモデルリポジトリ
- */
-class ProductModelRepo {
-    productModelModel;
-    constructor(connection) {
-        this.productModelModel = connection.model(productModel_1.modelName, (0, productModel_1.createSchema)());
-    }
-    // public static CREATE_MONGO_CONDITIONS(params: ISearchConditions) {
-    //     // MongoDB検索条件
-    //     const andConditions: FilterQuery<factory.product.IProduct>[] = [];
-    //     const projectIdEq = params.project?.id?.$eq;
-    //     if (typeof projectIdEq === 'string') {
-    //         andConditions.push({
-    //             'project.id': { $eq: projectIdEq }
-    //         });
-    //     }
-    //     const idEq = params.id?.$eq;
-    //     if (typeof idEq === 'string') {
-    //         andConditions.push({ _id: { $eq: idEq } });
-    //     }
-    //     const idIn = params.id?.$in;
-    //     if (Array.isArray(idIn)) {
-    //         andConditions.push({ _id: { $in: idIn } });
-    //     }
-    //     const categoryCodeValueIn = params.category?.codeValue?.$in;
-    //     if (Array.isArray(categoryCodeValueIn)) {
-    //         andConditions.push({ 'category.codeValue': { $exists: true, $in: categoryCodeValueIn } });
-    //     }
-    //     const categoryInCodeSetIdentifierEq = params.category?.inCodeSet?.identifier?.$eq;
-    //     if (typeof categoryInCodeSetIdentifierEq === 'string') {
-    //         andConditions.push({ 'category.inCodeSet.identifier': { $exists: true, $eq: categoryInCodeSetIdentifierEq } });
-    //     }
-    //     return andConditions;
-    // }
-    // public async search(
-    //     conditions: ISearchConditions,
-    //     inclusion: IKeyOfProjection[],
-    //     exclusion: IKeyOfProjection[]
-    // ): Promise<IProductModel[]> {
-    //     const andConditions = ProductModelRepo.CREATE_MONGO_CONDITIONS(conditions);
-    //     let projection: Record<string, number> = {};
-    //     if (Array.isArray(inclusion) && inclusion.length > 0) {
-    //         inclusion.forEach((field) => {
-    //             projection[field] = 1;
-    //         });
-    //     } else {
-    //         projection = {
-    //             __v: 0,
-    //             createdAt: 0,
-    //             updatedAt: 0
-    //         };
-    //         if (Array.isArray(exclusion) && exclusion.length > 0) {
-    //             exclusion.forEach((field) => {
-    //                 projection[field] = 0;
-    //             });
-    //         }
-    //     }
-    //     const query = this.productModelModel.find(
-    //         (andConditions.length > 0) ? { $and: andConditions } : {},
-    //         projection
-    //     );
-    //     if (typeof conditions.limit === 'number' && conditions.limit > 0) {
-    //         const page: number = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
-    //         query.limit(conditions.limit)
-    //             .skip(conditions.limit * (page - 1));
-    //     }
-    //     // if (conditions.sort?.productID !== undefined) {
-    //     //     query.sort({ productID: conditions.sort.productID });
-    //     // }
-    //     return query.setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
-    //         .exec()
-    //         .then((docs) => docs.map((doc) => doc.toObject({ virtuals: true })));
-    // }
-    // public async deleteById(params: { id: string }) {
-    //     await this.productModelModel.findOneAndDelete({ _id: params.id })
-    //         .exec();
-    // }
-    // /**
-    //  * プロダクトを保管する
-    //  */
-    // public async save(params: {
-    //     /**
-    //      * idを指定すれば更新
-    //      */
-    //     id?: string;
-    //     $set: Omit<IProductModel, 'id'> & { id?: never };
-    // }): Promise<{ id: string }> {
-    //     let savedId: string;
-    //     if (typeof params.id === 'string') {
-    //         // 上書き禁止属性を除外
-    //         const { category, id, project, typeOf, ...setFields } = params.$set; // eslint-disable-line @typescript-eslint/no-unused-vars
-    //         const updatedDoc = await this.productModelModel.findOneAndUpdate(
-    //             { _id: { $eq: params.id } },
-    //             {
-    //                 $set: setFields
-    //             },
-    //             { upsert: false, new: true, projection: { _id: 1 } }
-    //         )
-    //             .exec();
-    //         if (updatedDoc === null) {
-    //             throw new factory.errors.NotFound(this.productModelModel.modelName);
-    //         }
-    //         savedId = updatedDoc.id;
-    //     } else {
-    //         const { id, ...createParams } = params.$set; // eslint-disable-line @typescript-eslint/no-unused-vars
-    //         const createdDoc = await this.productModelModel.create(createParams);
-    //         savedId = createdDoc.id;
-    //     }
-    //     // if (doc === null) {
-    //     //     throw new factory.errors.NotFound(this.productModelModel.modelName);
-    //     // }
-    //     return { id: savedId };
-    // }
-    /**
-     * 区分から同期する
-     */
-    async upsertByCategory(params) {
-        const upsertingProductModel = {
-            project: { id: params.category.project.id, typeOf: factory_1.factory.organizationType.Project },
-            typeOf: 'ProductModel',
-            category: {
-                codeValue: params.category.codeValue,
-                inCodeSet: params.category.inCodeSet,
-                id: params.category.id
-            },
-            name: params.category.name,
-            offers: [{
-                    typeOf: factory_1.factory.offerType.Offer
-                }]
-        };
-        const { project, typeOf, offers, category, ...setFields } = upsertingProductModel;
-        const doc = await this.productModelModel.findOneAndUpdate({
-            'project.id': { $eq: upsertingProductModel.project.id },
-            'category.id': { $exists: true, $eq: upsertingProductModel.category.id }
-        }, {
-            $setOnInsert: { project, typeOf, offers, category },
-            $set: setFields
-        }, { new: true, upsert: true, projection: { _id: 1 } })
-            .exec();
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.productModelModel.modelName);
-        }
-        return doc.toObject({ virtuals: true });
-    }
-    /**
-     * 区分から削除する
-     */
-    async deleteByCategory(params) {
-        await this.productModelModel.deleteMany({
-            'project.id': { $eq: params.category.project.id },
-            'category.id': { $exists: true, $eq: params.category.id }
-        })
-            .exec();
-    }
-}
-exports.ProductModelRepo = ProductModelRepo;

package/lib/chevre/service/task/onResourceUpdated/onCategoryCodeUpdated.d.ts

@@ -1,15 +0,0 @@
-import type { CategoryCodeRepo } from '../../../repo/categoryCode';
-import type { ProductModelRepo } from '../../../repo/productModel';
-/**
- * 区分変更時処理
- */
-export declare function onCategoryCodeUpdated(params: {
-    project: {
-        id: string;
-    };
-    ids: string[];
-    isDeleted: boolean;
-}): (repos: {
-    categoryCode: CategoryCodeRepo;
-    productModel: ProductModelRepo;
-}) => Promise<void>;

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

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.onCategoryCodeUpdated = onCategoryCodeUpdated;
-const syncCategoryCode_1 = require("./syncCategoryCode");
-/**
- * 区分変更時処理
- */
-function onCategoryCodeUpdated(params) {
-    return async (repos) => {
-        await (0, syncCategoryCode_1.syncCategoryCode)({
-            project: { id: params.project.id },
-            ids: params.ids,
-            isDeleted: false
-        })(repos);
-    };
-}

package/lib/chevre/service/task/onResourceUpdated/syncCategoryCode.d.ts

@@ -1,15 +0,0 @@
-import type { CategoryCodeRepo } from '../../../repo/categoryCode';
-import type { ProductModelRepo } from '../../../repo/productModel';
-/**
- * 区分を他リソースへ同期する
- */
-export declare function syncCategoryCode(params: {
-    project: {
-        id: string;
-    };
-    ids: string[];
-    isDeleted: boolean;
-}): (repos: {
-    categoryCode: CategoryCodeRepo;
-    productModel: ProductModelRepo;
-}) => Promise<void>;

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

@@ -1,47 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.syncCategoryCode = syncCategoryCode;
-const factory_1 = require("../../../factory");
-/**
- * 区分を他リソースへ同期する
- */
-function syncCategoryCode(params) {
-    return async (repos) => {
-        if (params.isDeleted) {
-            for (const categoryCodeId of params.ids) {
-                // プロダクトモデルを削除
-                await repos.productModel.deleteByCategory({
-                    category: {
-                        project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
-                        id: categoryCodeId
-                    }
-                });
-            }
-        }
-        else {
-            for (const categoryCodeId of params.ids) {
-                const syncingCategoryCode = (await repos.categoryCode.projectCategoryCodeFields({
-                    limit: 1,
-                    page: 1,
-                    project: { id: { $eq: params.project.id } },
-                    id: { $eq: categoryCodeId }
-                }, ['codeValue', 'inCodeSet', 'name', 'project', 'id'])).shift();
-                if (syncingCategoryCode !== undefined) {
-                    switch (syncingCategoryCode.inCodeSet.identifier) {
-                        case factory_1.factory.categoryCode.CategorySetIdentifier.SeatingType:
-                            // プロダクトモデルへ同期
-                            await repos.productModel.upsertByCategory({
-                                category: {
-                                    ...syncingCategoryCode,
-                                    id: categoryCodeId
-                                }
-                            });
-                            break;
-                        default:
-                        // no op
-                    }
-                }
-            }
-        }
-    };
-}