@chevre/domain 21.28.0-alpha.8 → 21.28.0

package/example/src/chevre/playAroundProductModel.ts

@@ -0,0 +1,64 @@
+// 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 productModelRepo = await chevre.repository.ProductModel.createInstance(mongoose.connection);
+    const result = await productModelRepo.search(
+        {
+            limit: 100,
+            page: 1,
+            category: {
+                codeValue: { $in: ['Premium'] },
+                inCodeSet: { identifier: { $eq: chevre.factory.categoryCode.CategorySetIdentifier.SeatingType } }
+            }
+        },
+        [],
+        []
+    );
+    console.log('result:', result);
+
+    const productModel = {
+        project: {
+            id: project.id,
+            typeOf: <chevre.factory.organizationType.Project>chevre.factory.organizationType.Project
+        },
+        typeOf: <'ProductModel'>'ProductModel',
+        category: {
+            codeValue: 'Premium',
+            inCodeSet: {
+                identifier: chevre.factory.categoryCode.CategorySetIdentifier.SeatingType,
+                typeOf: <'CategoryCodeSet'>'CategoryCodeSet'
+            }
+        },
+        name: { ja: 'プレミアムシート' },
+        offers: [{
+            typeOf: <chevre.factory.offerType.Offer>chevre.factory.offerType.Offer
+        }]
+    };
+
+    const createdModel = await productModelRepo.save({
+        $set: productModel
+    });
+    console.log('created. id:', createdModel);
+
+    await productModelRepo.save({
+        id: createdModel.id,
+        $set: productModel
+    });
+    console.log('updated. id:', createdModel.id);
+
+    await productModelRepo.deleteById({
+        id: createdModel.id
+    });
+    console.log('deleted. id:', createdModel.id);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/searchCustomerTypes.ts

@@ -0,0 +1,57 @@
+// 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);
+
+    const customerTypeRepo = await chevre.repository.CustomerType.createInstance(mongoose.connection);
+
+    const saveResult = await customerTypeRepo.saveManyByCodeValue([
+        {
+            attributes: {
+                typeOf: 'CategoryCode',
+                codeValue: 'Enduser',
+                name: { ja: 'エンドユーザー' }
+            },
+            upsert: true
+        },
+        {
+            attributes: {
+                typeOf: 'CategoryCode',
+                codeValue: 'POS',
+                name: { ja: 'POS' }
+            },
+            upsert: true
+        },
+        {
+            attributes: {
+                typeOf: 'CategoryCode',
+                codeValue: 'TVM',
+                name: { ja: '券売機' }
+            },
+            upsert: true
+        }
+    ]);
+    console.log('saved,', saveResult);
+
+    const categoryCodes = await customerTypeRepo.search(
+        {
+            limit: 100,
+            page: 1,
+            sort: { codeValue: chevre.factory.sortType.Ascending },
+            codeValue: { $eq: 'Enduser' }
+        },
+        [],
+        []
+    );
+    console.log('categoryCodes found', categoryCodes);
+    console.log(categoryCodes.length, 'categoryCodes found');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -8,18 +8,22 @@ async function main() {
 
     let updateResult: any;
 
-    const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
-    updateResult = await eventRepo.unsetUnnecessaryFields<chevre.factory.eventType.ScreeningEvent>({
+    const productRepo = await chevre.repository.Product.createInstance(mongoose.connection);
+    updateResult = await productRepo.unsetUnnecessaryFields({
         filter: {
-            typeOf: {
-                $in: [
-                    chevre.factory.eventType.ScreeningEvent
-                ]
-            }
+            'serviceType.project': { $exists: true }
         },
-        $unset: <any>{
-            aggregateEntranceGate: 1,
-            'aggregateOffer.offers': 1
+        $unset: {
+            'serviceType.project': 1
+        }
+    });
+    console.log('unset processed.', updateResult);
+    updateResult = await productRepo.unsetUnnecessaryFields({
+        filter: {
+            provider: { $exists: true }
+        },
+        $unset: {
+            provider: 1
         }
     });
     console.log('unset processed.', updateResult);

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

@@ -1,4 +1,4 @@
-import type { AnyExpression, Connection, PipelineStage } from 'mongoose';
+import type { AnyExpression, Connection, FilterQuery, PipelineStage } from 'mongoose';
 import * as factory from '../factory';
 type IMatchStage = PipelineStage.Match;
 type KeyOfUnitPriceOffer = keyof factory.unitPriceOffer.IUnitPriceOffer;
@@ -69,5 +69,9 @@ export declare class MongoRepository {
      * 単価オファー最適化作業における一時的な処理
      */
     optimizeOffers(): Promise<import("mongodb").UpdateResult>;
+    unsetUnnecessaryFields(params: {
+        filter: FilterQuery<factory.aggregateOffer.IAggregateOffer>;
+        $unset: any;
+    }): Promise<import("mongodb").UpdateResult>;
 }
 export {};

package/lib/chevre/repo/aggregateOffer.js

@@ -588,5 +588,11 @@ class MongoRepository {
                 .exec();
         });
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.aggregateOfferModel.updateMany(params.filter, { $unset: params.$unset })
+                .exec();
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

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

@@ -25,6 +25,9 @@
 import { AnyExpression, Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 type IKeyOfProjection = keyof factory.categoryCode.ICategoryCode | '_id';
+type IUnset = {
+    [key in keyof Pick<factory.categoryCode.ICategoryCode, 'additionalProperty' | 'color' | 'image' | 'paymentMethod'>]?: 1;
+};
 /**
  * 区分リポジトリ
  */
@@ -45,7 +48,9 @@ export declare class MongoRepository {
     search(params: factory.categoryCode.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<factory.categoryCode.ICategoryCode[]>;
     save(params: {
         id?: string;
-        attributes: factory.categoryCode.ICategoryCode;
+        attributes: factory.categoryCode.ICategoryCode & {
+            $unset?: IUnset;
+        };
     }): Promise<factory.categoryCode.ICategoryCode>;
     saveManyByCodeValue(params: {
         attributes: factory.categoryCode.ICategoryCode;

package/lib/chevre/repo/categoryCode.js

@@ -83,21 +83,11 @@ class MongoRepository {
         }
         const codeValueEq = (_c = params.codeValue) === null || _c === void 0 ? void 0 : _c.$eq;
         if (typeof codeValueEq === 'string') {
-            andConditions.push({
-                codeValue: {
-                    $exists: true,
-                    $eq: codeValueEq
-                }
-            });
+            andConditions.push({ codeValue: { $eq: codeValueEq } });
         }
         const codeValueIn = (_d = params.codeValue) === null || _d === void 0 ? void 0 : _d.$in;
         if (Array.isArray(codeValueIn)) {
-            andConditions.push({
-                codeValue: {
-                    $exists: true,
-                    $in: codeValueIn
-                }
-            });
+            andConditions.push({ codeValue: { $in: codeValueIn } });
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
@@ -259,12 +249,13 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             let doc;
             if (typeof params.id !== 'string') {
-                doc = yield this.categoryCodeModel.create(params.attributes);
+                const _a = params.attributes, { id, $unset } = _a, creatingDoc = __rest(_a, ["id", "$unset"]);
+                doc = yield this.categoryCodeModel.create(creatingDoc);
             }
             else {
                 // 上書き禁止属性を除外(2022-08-24~)
-                const _a = params.attributes, { id, codeValue, inCodeSet, project, typeOf } = _a, updateFields = __rest(_a, ["id", "codeValue", "inCodeSet", "project", "typeOf"]);
-                doc = yield this.categoryCodeModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
+                const _b = params.attributes, { id, codeValue, inCodeSet, project, typeOf, $unset } = _b, updateFields = __rest(_b, ["id", "codeValue", "inCodeSet", "project", "typeOf", "$unset"]);
+                doc = yield this.categoryCodeModel.findOneAndUpdate({ _id: { $eq: params.id } }, Object.assign({ $set: updateFields }, ($unset !== undefined) ? { $unset } : undefined), { upsert: false, new: true })
                     .exec();
             }
             if (doc === null) {

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

@@ -0,0 +1,22 @@
+import type { BulkWriteResult } from 'mongodb';
+import { Connection, FilterQuery } from 'mongoose';
+import * as factory from '../factory';
+type ICustomerType = Pick<factory.categoryCode.ICategoryCode, 'codeValue' | 'id' | 'name' | 'typeOf'>;
+type IKeyOfProjection = keyof ICustomerType | '_id';
+/**
+ * カスタマータイプリポジトリ
+ */
+export declare class MongoRepository {
+    private readonly customerTypeModel;
+    constructor(connection: Connection);
+    static CREATE_MONGO_CONDITIONS(params: factory.categoryCode.ISearchConditions): FilterQuery<ICustomerType>[];
+    /**
+     * 検索
+     */
+    search(params: factory.categoryCode.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<ICustomerType[]>;
+    saveManyByCodeValue(params: {
+        attributes: ICustomerType;
+        upsert?: boolean;
+    }[]): Promise<BulkWriteResult | void>;
+}
+export {};

package/lib/chevre/repo/customerType.js

@@ -0,0 +1,105 @@
+"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.MongoRepository = void 0;
+const customerType_1 = require("./mongoose/schemas/customerType");
+const settings_1 = require("../settings");
+/**
+ * カスタマータイプリポジトリ
+ */
+class MongoRepository {
+    constructor(connection) {
+        this.customerTypeModel = connection.model(customerType_1.modelName, (0, customerType_1.createSchema)());
+    }
+    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
+    static CREATE_MONGO_CONDITIONS(params) {
+        var _a, _b;
+        const andConditions = [];
+        const codeValueEq = (_a = params.codeValue) === null || _a === void 0 ? void 0 : _a.$eq;
+        if (typeof codeValueEq === 'string') {
+            andConditions.push({ codeValue: { $exists: true, $eq: codeValueEq } });
+        }
+        const codeValueIn = (_b = params.codeValue) === null || _b === void 0 ? void 0 : _b.$in;
+        if (Array.isArray(codeValueIn)) {
+            andConditions.push({ codeValue: { $exists: true, $in: codeValueIn } });
+        }
+        return andConditions;
+    }
+    /**
+     * 検索
+     */
+    search(params, inclusion, exclusion) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
+            let projection = {};
+            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.customerTypeModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
+            if (typeof params.limit === 'number' && params.limit > 0) {
+                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+                query.limit(params.limit)
+                    .skip(params.limit * (page - 1));
+            }
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (params.sort !== undefined) {
+                query.sort(params.sort);
+            }
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec()
+                .then((docs) => docs.map((doc) => doc.toObject()));
+        });
+    }
+    saveManyByCodeValue(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const bulkWriteOps = [];
+            if (Array.isArray(params)) {
+                params.forEach((p) => {
+                    const $set = Object.assign({}, p.attributes);
+                    if (typeof $set.id === 'string') {
+                        delete $set.id;
+                    }
+                    bulkWriteOps.push({
+                        updateOne: {
+                            filter: {
+                                codeValue: { $eq: p.attributes.codeValue }
+                            },
+                            update: {
+                                $set
+                                // $setOnInsert: {}
+                            },
+                            upsert: (p.upsert !== undefined) ? p.upsert : false
+                        }
+                    });
+                });
+            }
+            if (bulkWriteOps.length > 0) {
+                return this.customerTypeModel.bulkWrite(bulkWriteOps, { ordered: false });
+            }
+        });
+    }
+}
+exports.MongoRepository = MongoRepository;

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

@@ -88,7 +88,7 @@ export declare class MongoRepository {
     createMany<T extends factory.eventType>(params: {
         attributes: factory.event.IAttributes<T>[];
         expectsNoContent: boolean;
-    }): Promise<string[] | void>;
+    }): Promise<factory.event.IEvent<T>[] | void>;
     /**
      * 特定の追加特性をキーにして、存在しなければ作成する(複数対応)
      * 存在すれば、eventStatusのみ更新する

package/lib/chevre/repo/event.js

@@ -476,12 +476,12 @@ class MongoRepository {
     createMany(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const uniqid = yield Promise.resolve().then(() => require('uniqid'));
-            // let docs: HydratedDocument<factory.event.IEvent<T>>[];
+            let docs;
             const insertingDocs = params.attributes.map((p) => {
                 return Object.assign({ _id: uniqid() }, p);
             });
             try {
-                yield this.eventModel.insertMany(insertingDocs, { lean: true });
+                docs = yield this.eventModel.insertMany(insertingDocs);
             }
             catch (error) {
                 if (yield (0, errorHandler_1.isMongoError)(error)) {
@@ -494,7 +494,7 @@ class MongoRepository {
             if (params.expectsNoContent) {
                 return;
             }
-            return insertingDocs.map((doc) => doc._id);
+            return docs.map((doc) => doc.toObject());
         });
     }
     /**

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

@@ -0,0 +1,5 @@
+import { IndexDefinition, IndexOptions, Schema } from 'mongoose';
+declare const modelName = "CustomerType";
+declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): Schema;
+export { modelName, indexes, createSchema };

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

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSchema = exports.indexes = exports.modelName = void 0;
+const mongoose_1 = require("mongoose");
+const writeConcern_1 = require("../writeConcern");
+const settings_1 = require("../../../settings");
+const modelName = 'CustomerType';
+exports.modelName = modelName;
+const schemaDefinition = {
+    typeOf: { type: String, required: true },
+    codeValue: { type: String, required: true },
+    name: mongoose_1.SchemaTypes.Mixed
+};
+const schemaOptions = {
+    autoIndex: settings_1.MONGO_AUTO_INDEX,
+    autoCreate: false,
+    collection: 'customerTypes',
+    id: true,
+    read: settings_1.MONGO_READ_PREFERENCE,
+    writeConcern: writeConcern_1.writeConcern,
+    strict: true,
+    strictQuery: false,
+    timestamps: {
+        createdAt: 'createdAt',
+        updatedAt: 'updatedAt'
+    },
+    toJSON: {
+        getters: false,
+        virtuals: false,
+        minimize: false,
+        versionKey: false
+    },
+    toObject: {
+        getters: false,
+        virtuals: true,
+        minimize: false,
+        versionKey: false
+    }
+};
+const indexes = [
+    [
+        { createdAt: 1 },
+        { name: 'searchByCreatedAt' }
+    ],
+    [
+        { updatedAt: 1 },
+        { name: 'searchByUpdatedAt' }
+    ]
+];
+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 === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}
+exports.createSchema = createSchema;

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

@@ -1,5 +1,5 @@
 import { IndexDefinition, IndexOptions, Schema } from 'mongoose';
 declare const modelName = "Product";
-declare function createSchema(): Schema;
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): Schema;
 export { modelName, indexes, createSchema };

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

@@ -8,21 +8,15 @@ const modelName = 'Product';
 exports.modelName = modelName;
 const schemaDefinition = {
     project: mongoose_1.SchemaTypes.Mixed,
-    typeOf: {
-        type: String,
-        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],
-    productID: {
-        type: String,
-        required: true
-    },
-    provider: [mongoose_1.SchemaTypes.Mixed],
+    productID: { type: String, required: true },
+    // provider: [SchemaTypes.Mixed], // 廃止(2024-04-12~)
     serviceOutput: mongoose_1.SchemaTypes.Mixed,
     serviceType: mongoose_1.SchemaTypes.Mixed
 };
@@ -52,17 +46,6 @@ const schemaOptions = {
         versionKey: false
     }
 };
-/**
- * プロダクトスキーマ
- */
-let schema;
-function createSchema() {
-    if (schema === undefined) {
-        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
-    }
-    return schema;
-}
-exports.createSchema = createSchema;
 const indexes = [
     [
         { createdAt: 1 },
@@ -74,15 +57,11 @@ const indexes = [
     ],
     [
         { productID: 1 },
-        {
-            name: 'searchByProductID'
-        }
+        { name: 'searchByProductID' }
     ],
     [
         { 'project.id': 1, productID: 1 },
-        {
-            name: 'searchByProjectId-v20220721'
-        }
+        { name: 'searchByProjectId-v20220721' }
     ],
     [
         { 'hasOfferCatalog.id': 1, productID: 1 },
@@ -122,9 +101,7 @@ const indexes = [
     ],
     [
         { typeOf: 1, productID: 1 },
-        {
-            name: 'searchByTypeOf'
-        }
+        { name: 'searchByTypeOf' }
     ],
     [
         { 'name.ja': 1, productID: 1 },
@@ -143,15 +120,22 @@ const indexes = [
                 'name.en': { $exists: true }
             }
         }
-    ],
-    [
-        { 'provider.id': 1, productID: 1 },
-        {
-            name: 'searchByProviderId',
-            partialFilterExpression: {
-                'provider.id': { $exists: true }
-            }
-        }
     ]
 ];
 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 === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}
+exports.createSchema = createSchema;

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

@@ -0,0 +1,5 @@
+import { IndexDefinition, IndexOptions, Schema } from 'mongoose';
+declare const modelName = "ProductModel";
+declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): Schema;
+export { modelName, indexes, createSchema };

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

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSchema = exports.indexes = exports.modelName = void 0;
+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: {
+        createdAt: 'createdAt',
+        updatedAt: 'updatedAt'
+    },
+    toJSON: {
+        getters: false,
+        virtuals: false,
+        minimize: false,
+        versionKey: false
+    },
+    toObject: {
+        getters: false,
+        virtuals: true,
+        minimize: false,
+        versionKey: false
+    }
+};
+const indexes = [
+    [
+        { createdAt: 1 },
+        { name: 'searchByCreatedAt' }
+    ],
+    [
+        { updatedAt: 1 },
+        { name: 'searchByUpdatedAt' }
+    ]
+];
+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 === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}
+exports.createSchema = createSchema;