@chevre/domain 22.11.0-alpha.4 → 22.11.0-alpha.40

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

@@ -1,11 +1,13 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
+import { IGlobalMember } from './mongoose/schemas/member/global';
 type IKeyOfProjection = keyof factory.iam.IMember;
 export type ICustomerMember = Pick<factory.iam.IMemberOfRole, 'hasRole' | 'id' | 'name' | 'memberOf'>;
 /**
  * IAMメンバーリポジトリ
  */
 export declare class MemberRepo {
+    private readonly globalMemberModel;
     private readonly memberModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.iam.ISearchConditions): FilterQuery<factory.iam.IMember>[];
@@ -37,7 +39,10 @@ export declare class MemberRepo {
     }): Promise<{
         member: ICustomerMember;
     }[]>;
-    aggregateRoleNames(params: {
+    /**
+     * distinctコマンドを使用して、プロジェクトメンバーのロールを検索する
+     */
+    findRoleNamesByMember(params: {
         project: {
             id: {
                 $eq: string;
@@ -56,9 +61,7 @@ export declare class MemberRepo {
                 };
             };
         };
-    }): Promise<{
-        roleName: string;
-    }[]>;
+    }): Promise<string[]>;
     deleteByProject(params: {
         project: {
             id: string;
@@ -163,6 +166,21 @@ export declare class MemberRepo {
         filter: any;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
+    /**
+     * グローバルメンバー作成
+     * 2025-07-21~
+     */
+    createGlobalMember(params: IGlobalMember[]): Promise<void>;
+    /**
+     * distinctコマンドを使用して、グローバルメンバーのロールを検索する
+     */
+    findGlobalRoleNamesByMember(params: {
+        member: {
+            id: {
+                $eq: string;
+            };
+        };
+    }): Promise<string[]>;
     private projectFields;
 }
 export {};

package/lib/chevre/repo/member.js

@@ -13,16 +13,19 @@ exports.MemberRepo = void 0;
 const factory = require("../factory");
 const settings_1 = require("../settings");
 const member_1 = require("./mongoose/schemas/member");
+const global_1 = require("./mongoose/schemas/member/global");
 const AVAILABLE_PROJECT_FIELDS = [
     'project',
     'typeOf',
     'member'
 ];
+const ANY_PROJECT_ID = '*';
 /**
  * IAMメンバーリポジトリ
  */
 class MemberRepo {
     constructor(connection) {
+        this.globalMemberModel = connection.model(global_1.modelName, (0, global_1.createSchema)());
         this.memberModel = connection.model(member_1.modelName, (0, member_1.createSchema)());
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
@@ -112,7 +115,7 @@ class MemberRepo {
                 throw new factory.errors.ArgumentNull('project.id');
             }
             const filterQueries = MemberRepo.CREATE_MONGO_CONDITIONS({
-                project: { id: { $in: [params.project.id, '*'] } }, // 全プロジェクトで利用可能なクライアントを考慮(2025-01-11~)
+                project: { id: { $in: [params.project.id, ANY_PROJECT_ID] } }, // 全プロジェクトで利用可能なクライアントを考慮(2025-01-11~)
                 member: {
                     typeOf: { $eq: factory.creativeWorkType.WebApplication },
                     memberOf: { typeOf: { $eq: factory.organizationType.Project } }, // プロジェクトメンバーのはず
@@ -163,32 +166,55 @@ class MemberRepo {
                 .exec();
         });
     }
-    aggregateRoleNames(params) {
+    // migrate to findRoleNamesByMember(2025-07-21~)
+    // public async aggregateRoleNames(params: {
+    //     project: { id: { $eq: string } };
+    //     member: {
+    //         id: { $eq: string };
+    //         memberOf: {
+    //             id: { $eq: string };
+    //             typeOf: { $eq: factory.organizationType.Corporation | factory.organizationType.Project };
+    //         };
+    //     };
+    // }): Promise<{ roleName: string }[]> {
+    //     const matchStages: IMatchStage[] = [
+    //         { $match: { 'project.id': { $eq: params.project.id.$eq } } },
+    //         { $match: { 'member.id': { $eq: params.member.id.$eq } } },
+    //         { $match: { 'member.memberOf.id': { $eq: params.member.memberOf.id.$eq } } },
+    //         { $match: { 'member.memberOf.typeOf': { $eq: params.member.memberOf.typeOf.$eq } } }
+    //     ];
+    //     const aggregate = this.memberModel.aggregate([
+    //         // ...(typeof params.sort?.productID === 'number')
+    //         //     ? [{ $sort: { productID: params.sort.productID } }]
+    //         //     : [],
+    //         ...matchStages,
+    //         {
+    //             $unwind: {
+    //                 path: '$member.hasRole'
+    //             }
+    //         },
+    //         {
+    //             $project: {
+    //                 _id: 0,
+    //                 roleName: '$member.hasRole.roleName'
+    //             }
+    //         }
+    //     ]);
+    //     return aggregate.option({ maxTimeMS: MONGO_MAX_TIME_MS })
+    //         .exec();
+    // }
+    /**
+     * distinctコマンドを使用して、プロジェクトメンバーのロールを検索する
+     */
+    findRoleNamesByMember(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const matchStages = [
-                { $match: { 'project.id': { $eq: params.project.id.$eq } } },
-                { $match: { 'member.id': { $eq: params.member.id.$eq } } },
-                { $match: { 'member.memberOf.id': { $eq: params.member.memberOf.id.$eq } } },
-                { $match: { 'member.memberOf.typeOf': { $eq: params.member.memberOf.typeOf.$eq } } }
-            ];
-            const aggregate = this.memberModel.aggregate([
-                // ...(typeof params.sort?.productID === 'number')
-                //     ? [{ $sort: { productID: params.sort.productID } }]
-                //     : [],
-                ...matchStages,
-                {
-                    $unwind: {
-                        path: '$member.hasRole'
-                    }
-                },
-                {
-                    $project: {
-                        _id: 0,
-                        roleName: '$member.hasRole.roleName'
-                    }
-                }
-            ]);
-            return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            return this.memberModel.distinct('member.hasRole.roleName', {
+                'project.id': { $eq: params.project.id.$eq },
+                'member.id': { $eq: params.member.id.$eq },
+                'member.memberOf.id': { $eq: params.member.memberOf.id.$eq },
+                'member.memberOf.typeOf': { $eq: params.member.memberOf.typeOf.$eq }
+            })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
@@ -293,7 +319,9 @@ class MemberRepo {
             if (typeof params.page !== 'number') {
                 throw new factory.errors.ArgumentNull('page');
             }
-            const matchStages = [{ $match: { 'member.id': { $eq: params.member.id } } }];
+            const matchStages = [
+                { $match: { 'member.id': { $eq: params.member.id } } }
+            ];
             if (typeof ((_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq) === 'string') {
                 matchStages.push({ $match: { 'project.id': { $eq: params.project.id.$eq } } });
             }
@@ -343,6 +371,32 @@ class MemberRepo {
                 .exec();
         });
     }
+    /**
+     * グローバルメンバー作成
+     * 2025-07-21~
+     */
+    createGlobalMember(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (params.length > 0) {
+                yield this.globalMemberModel.insertMany(params.map(({ typeOf, member }) => ({ typeOf, member })));
+            }
+            else {
+                // no op
+            }
+        });
+    }
+    /**
+     * distinctコマンドを使用して、グローバルメンバーのロールを検索する
+     */
+    findGlobalRoleNamesByMember(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.globalMemberModel.distinct('member.hasRole.roleName', {
+                'member.id': { $eq: params.member.id.$eq }
+            })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
     projectFields(params, inclusion) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MemberRepo.CREATE_MONGO_CONDITIONS(params);

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

@@ -1,6 +1,6 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import * as factory from '../../../factory';
-type IDocType = Omit<factory.creativeWork.certification.webApplication.ICertification, 'id'>;
+type IDocType = Omit<factory.creativeWork.certification.softwareApplication.ICertification, 'id'> | Omit<factory.creativeWork.certification.webApplication.ICertification, 'id'>;
 type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;

package/lib/chevre/repo/mongoose/schemas/member/global.d.ts

@@ -0,0 +1,14 @@
+import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
+import * as factory from '../../../../factory';
+type IMemberOfRole = Pick<factory.iam.IMemberOfRole, 'hasRole' | 'id' | 'image' | 'name' | 'typeOf' | 'username'>;
+type IGlobalMember = Pick<factory.iam.IMember, 'typeOf'> & {
+    member: IMemberOfRole;
+};
+type IDocType = IGlobalMember;
+type IModel = Model<IDocType>;
+type ISchemaDefinition = SchemaDefinition<IDocType>;
+type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
+declare const modelName = "Member.Global";
+declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): ISchema;
+export { createSchema, IGlobalMember, IModel, indexes, modelName };

package/lib/chevre/repo/mongoose/schemas/member/global.js

@@ -0,0 +1,82 @@
+"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 = 'Member.Global';
+exports.modelName = modelName;
+const schemaDefinition = {
+    // globalロール管理なのでprojectは不要
+    // project: {
+    //     type: SchemaTypes.Mixed,
+    //     required: true
+    // },
+    typeOf: {
+        type: String,
+        required: true
+    },
+    member: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    }
+};
+const schemaOptions = {
+    autoIndex: settings_1.MONGO_AUTO_INDEX,
+    autoCreate: false,
+    collection: 'members.global',
+    id: true,
+    read: settings_1.MONGO_READ_PREFERENCE,
+    writeConcern: writeConcern_1.writeConcern,
+    strict: true,
+    strictQuery: false,
+    timestamps: false,
+    versionKey: false,
+    toJSON: {
+        getters: false,
+        virtuals: false,
+        minimize: false,
+        versionKey: false
+    },
+    toObject: {
+        getters: false,
+        virtuals: true,
+        minimize: false,
+        versionKey: false
+    }
+};
+const indexes = [
+    [
+        { 'member.id': 1 },
+        {
+            name: 'uniqueIAMMember',
+            unique: true
+        }
+    ],
+    [
+        { 'member.hasRole.roleName': 1, 'member.id': 1 },
+        {
+            name: 'searchByMemberHasRoleRoleName',
+            partialFilterExpression: {
+                'member.hasRole.roleName': { $exists: true }
+            }
+        }
+    ]
+];
+exports.indexes = indexes;
+/**
+ * グロバールIAMメンバースキーマ
+ */
+let schema;
+function createSchema() {
+    if (schema === undefined) {
+        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
+        if (settings_1.MONGO_AUTO_INDEX) {
+            indexes.forEach((indexParams) => {
+                schema === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}

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

@@ -120,6 +120,15 @@ const indexes = [
                 'name.en': { $exists: true }
             }
         }
+    ],
+    [
+        { additionalProperty: 1, productID: 1 },
+        {
+            name: 'additionalProperty',
+            partialFilterExpression: {
+                additionalProperty: { $exists: true }
+            }
+        }
     ]
 ];
 exports.indexes = indexes;

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

@@ -13,6 +13,20 @@ interface IOnReservationStatusChanged {
      */
     informReservation?: factory.project.IInformParams[];
 }
+interface IOnTaskStatusChanged {
+    /**
+     * AggService通知先
+     */
+    informTask?: factory.project.IInformParams[];
+    /**
+     * 分析連携するtaskNameリスト
+     */
+    informTaskNames?: factory.taskName[];
+    /**
+     * 分析連携するtaskStatusリスト
+     */
+    informTaskStatuses?: factory.taskStatus[];
+}
 interface IOnEventChanged {
     informEvent2agg?: factory.project.IInformParams[];
 }
@@ -102,6 +116,7 @@ export interface ISetting {
     onEventChanged?: IOnEventChanged;
     onOrderStatusChanged: IOnOrderStatusChanged;
     onReservationStatusChanged?: IOnReservationStatusChanged;
+    onTaskStatusChanged?: IOnTaskStatusChanged;
     onResourceUpdated?: {
         informResource?: factory.project.IInformParams[];
     };

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

@@ -14,6 +14,7 @@ const schemaDefinition = {
     onEventChanged: mongoose_1.SchemaTypes.Mixed,
     onOrderStatusChanged: mongoose_1.SchemaTypes.Mixed,
     onReservationStatusChanged: mongoose_1.SchemaTypes.Mixed,
+    onTaskStatusChanged: mongoose_1.SchemaTypes.Mixed,
     onResourceUpdated: mongoose_1.SchemaTypes.Mixed,
     onTransactionStatusChanged: mongoose_1.SchemaTypes.Mixed,
     quota: mongoose_1.SchemaTypes.Mixed,

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

@@ -186,6 +186,15 @@ const indexes = [
             }
         }
     ],
+    [
+        { status: 1, lastTriedAt: 1, remainingNumberOfTries: 1, name: 1 },
+        {
+            name: 'abortMany',
+            partialFilterExpression: {
+                lastTriedAt: { $type: 'date' }
+            }
+        }
+    ],
     [
         { status: 1, expires: 1 },
         {

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

@@ -204,8 +204,8 @@ export declare class OrderRepo {
             emailCount?: number;
         };
     }>;
-    aggregateOrderOfCustomer(params: {
-        project: {
+    aggregateOrderOfCustomerByProject(params: {
+        project?: {
             id: {
                 $eq: string;
             };
@@ -225,5 +225,20 @@ export declare class OrderRepo {
             emailCount?: number;
         };
     }>;
+    aggregateOrderOfCustomerGlobally(params: {
+        orderDate: {
+            $gte: Date;
+            $lte: Date;
+        };
+        customer: {
+            email: {
+                $eq: string;
+            };
+        };
+    }): Promise<{
+        aggregation: Pick<IAggregation, 'orderCount'> & {
+            sumGraceTime?: never;
+        };
+    }>;
 }
 export {};

package/lib/chevre/repo/order.js

@@ -1198,17 +1198,13 @@ class OrderRepo {
             };
         });
     }
-    aggregateOrderOfCustomer(params) {
+    aggregateOrderOfCustomerByProject(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const matchConditions = {
-                orderDate: {
+            var _a;
+            const matchConditions = Object.assign(Object.assign({ orderDate: {
                     $gte: params.orderDate.$gte,
                     $lte: params.orderDate.$lte
-                },
-                typeOf: { $eq: factory.order.OrderType.Order },
-                'project.id': { $eq: params.project.id.$eq },
-                'customer.email': { $exists: true, $eq: params.customer.email.$eq }
-            };
+                }, typeOf: { $eq: factory.order.OrderType.Order } }, (typeof ((_a = params.project) === null || _a === void 0 ? void 0 : _a.id.$eq) === 'string') ? { 'project.id': { $eq: params.project.id.$eq } } : undefined), { 'customer.email': { $exists: true, $eq: params.customer.email.$eq } });
             const aggregations = yield this.orderModel.aggregate([
                 { $match: matchConditions },
                 {
@@ -1250,5 +1246,48 @@ class OrderRepo {
             };
         });
     }
+    aggregateOrderOfCustomerGlobally(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const matchConditions = {
+                orderDate: {
+                    $gte: params.orderDate.$gte,
+                    $lte: params.orderDate.$lte
+                },
+                typeOf: { $eq: factory.order.OrderType.Order },
+                'customer.email': { $exists: true, $eq: params.customer.email.$eq }
+            };
+            const aggregations = yield this.orderModel.aggregate([
+                { $match: matchConditions },
+                {
+                    $project: {
+                        typeOf: '$typeOf'
+                    }
+                },
+                {
+                    $group: {
+                        _id: '$typeOf',
+                        orderCount: { $sum: 1 }
+                    }
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        orderCount: '$orderCount'
+                    }
+                }
+            ])
+                .exec();
+            if (aggregations.length === 0) {
+                return {
+                    aggregation: {
+                        orderCount: 0
+                    }
+                };
+            }
+            return {
+                aggregation: Object.assign({}, aggregations[0])
+            };
+        });
+    }
 }
 exports.OrderRepo = OrderRepo;

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

@@ -1,12 +1,10 @@
 import type { Connection } from 'mongoose';
-import { RedisClientType } from 'redis';
 /**
  * 注文番号リポジトリ
  */
 export declare class OrderNumberRepo {
     private readonly counterRepo;
     constructor(params: {
-        redisClient: RedisClientType;
         connection: Connection;
     });
     /**
@@ -21,5 +19,4 @@ export declare class OrderNumberRepo {
          */
         orderDate: Date;
     }): Promise<string>;
-    private useMongoBySettings;
 }

package/lib/chevre/repo/orderNumber.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrderNumberRepo = void 0;
 const cdigit = require("cdigit");
 const moment = require("moment-timezone");
+// import { RedisClientType } from 'redis';
 // tslint:disable-next-line:no-require-imports no-var-requires
 const fpe = require('node-fpe');
 // import { createSchema as createSettingSchema, modelName as settingModelName } from './mongoose/schemas/setting';
@@ -52,27 +53,15 @@ class OrderNumberRepo {
             let dataFeedExpires;
             const dataFeedIdentifier = `${projectPrefix}:${timestamp}`;
             let incrReply;
-            const useMongoBySettings = yield this.useMongoBySettings(params);
-            if (useMongoBySettings) {
-                dataFeedExpires = moment(params.orderDate)
-                    .add(1, 'minute') // ミリ秒でカウントしていくので、注文日時後1分で十分
-                    .toDate();
-                incrReply = yield this.counterRepo.incrementByMongo({
-                    identifier: dataFeedIdentifier,
-                    includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.orderNumber },
-                    expires: dataFeedExpires
-                });
-            }
-            else {
-                dataFeedExpires = moment(params.orderDate)
-                    .add(1, 'minute') // ミリ秒でカウントしていくので、注文日時後1分で十分
-                    .toDate();
-                incrReply = yield this.counterRepo.incrementByRedis({
-                    identifier: dataFeedIdentifier,
-                    includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.orderNumber },
-                    expires: dataFeedExpires
-                });
-            }
+            // const useMongoBySettings = await this.useMongoBySettings(params);
+            dataFeedExpires = moment(params.orderDate)
+                .add(1, 'minute') // ミリ秒でカウントしていくので、注文日時後1分で十分
+                .toDate();
+            incrReply = yield this.counterRepo.incrementByMongo({
+                identifier: dataFeedIdentifier,
+                includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.orderNumber },
+                expires: dataFeedExpires
+            });
             let orderNumber = `${timestamp}${incrReply}`;
             // checkdigit
             const cd = cdigit.luhn.compute(orderNumber);
@@ -90,28 +79,5 @@ class OrderNumberRepo {
             return orderNumber;
         });
     }
-    // /**
-    //  * DB移行時のみに使用目的の設定更新
-    //  */
-    // public async setUseMongo4orderNumberFrom(params: {
-    //     useMongo4orderNumberFrom: Date;
-    // }) {
-    //     const { useMongo4orderNumberFrom } = params;
-    //     return this.settingModel.findOneAndUpdate(
-    //         { 'project.id': { $eq: '*' } },
-    //         {
-    //             $set: { useMongo4orderNumberFrom }
-    //         },
-    //         { projection: { _id: 0, useMongo4orderNumberFrom: 1 } }
-    //     )
-    //         .lean<Pick<ISetting, 'useMongo4orderNumberFrom'> | null>()
-    //         .exec();
-    // }
-    // tslint:disable-next-line:prefer-function-over-method
-    useMongoBySettings(__) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return true;
-        });
-    }
 }
 exports.OrderNumberRepo = OrderNumberRepo;

package/lib/chevre/repo/pendingReservation.js

@@ -587,6 +587,7 @@ class PendingReservationRepo {
                         throw new factory.errors.AlreadyInUse(factory.reservationType.EventReservation, ['ticketedSeat'], 'Already hold');
                     }
                 }
+                throw error;
             }
         });
     }

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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
         // 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;
@@ -151,25 +151,20 @@ class ProductRepo {
             const nameRegexExp = new RegExp(nameRegex);
             andConditions.push({
                 $or: [
-                    {
-                        'name.ja': {
-                            $exists: true,
-                            $regex: nameRegexExp
-                        }
-                    },
-                    {
-                        'name.en': {
-                            $exists: true,
-                            $regex: nameRegexExp
-                        }
-                    }
+                    { 'name.ja': { $exists: true, $regex: nameRegexExp } },
+                    { 'name.en': { $exists: true, $regex: nameRegexExp } }
                 ]
             });
         }
-        // const providerIdEq = params.provider?.id?.$eq;
-        // if (typeof providerIdEq === 'string') {
-        //     andConditions.push({ 'provider.id': { $exists: true, $eq: providerIdEq } });
-        // }
+        const additionalPropertyElemMatchNameEq = (_w = params.additionalPropertyMatch) === null || _w === void 0 ? void 0 : _w.nameEq;
+        if (typeof additionalPropertyElemMatchNameEq === 'string') {
+            andConditions.push({
+                additionalProperty: {
+                    $exists: true,
+                    $elemMatch: { name: { $eq: additionalPropertyElemMatchNameEq } }
+                }
+            });
+        }
         return andConditions;
     }
     /**