@chevre/domain 22.3.0-alpha.3 → 22.3.0-alpha.5

package/example/src/chevre/projectFields.ts

@@ -12,29 +12,19 @@ mongoose.Model.on('index', (...args) => {
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
+    const customerRepo = await chevre.repository.Customer.createInstance(mongoose.connection);
 
-    const docs = await actionRepo.search(
+    const docs = await customerRepo.projectFields(
         {
             limit: 1,
-            page: 1,
-            typeOf: { $eq: chevre.factory.actionType.AuthorizeAction }
+            page: 1
         },
-        ['id', 'typeOf', 'actionStatus'],
-        ['result', 'cancelAction', 'instrument', 'object']
+        ['contactPoint', 'additionalProperty'],
+        ['contactPoint', 'additionalProperty']
     );
     // tslint:disable-next-line:no-null-keyword
     console.dir(docs, { depth: null });
     console.log(docs.length, 'docs found');
-
-    const actions = await actionRepo.searchByOrderNumber(
-        {
-            orderNumber: 'CIN9-4893721-9248784'
-        }
-    );
-    // tslint:disable-next-line:no-null-keyword
-    console.dir(actions, { depth: null });
-    console.log(actions.length, 'actions found');
 }
 
 main()

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

@@ -24,7 +24,10 @@
 /// <reference types="mongoose/types/inferschematype" />
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
-type IKeyOfProjection = keyof factory.customer.ICustomer | '_id';
+type IUnset = {
+    [key in keyof Pick<factory.customer.ICustomer, 'telephone' | 'url'>]?: 1;
+};
+type IKeyOfProjection = keyof factory.customer.ICustomer;
 /**
  * 顧客リポジトリ
  */
@@ -34,14 +37,17 @@ export declare class CustomerRepo {
     static CREATE_MONGO_CONDITIONS(params: factory.customer.ISearchConditions): FilterQuery<factory.customer.ICustomer>[];
     save(params: {
         id?: string;
-        attributes: factory.customer.ICustomer;
-    }): Promise<factory.customer.ICustomer>;
+        attributes: Omit<factory.customer.ICustomer, 'id'> & {
+            id?: never;
+            $unset?: IUnset;
+        };
+    }): Promise<{
+        id: string;
+    }>;
     /**
      * 顧客検索
      */
-    search(conditions: factory.customer.ISearchConditions, projection?: {
-        [key in IKeyOfProjection]?: 0;
-    }): Promise<factory.customer.ICustomer[]>;
+    projectFields(conditions: factory.customer.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<factory.customer.ICustomer[]>;
     deleteById(params: {
         id: string;
     }): Promise<void>;

package/lib/chevre/repo/customer.js

@@ -24,6 +24,17 @@ exports.CustomerRepo = void 0;
 const customer_1 = require("./mongoose/schemas/customer");
 const factory = require("../factory");
 const settings_1 = require("../settings");
+const AVAILABLE_PROJECT_FIELDS = [
+    'additionalProperty',
+    'contactPoint',
+    // 'email',
+    'branchCode',
+    'name',
+    'project',
+    'typeOf',
+    'url'
+    // 'telephone'f
+];
 /**
  * 顧客リポジトリ
  */
@@ -67,33 +78,49 @@ class CustomerRepo {
         return andConditions;
     }
     save(params) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            let customer;
+            let savedId;
             if (params.id === undefined) {
-                const doc = yield this.customerModel.create(params.attributes);
-                customer = doc.toObject();
+                const _c = params.attributes, { id, $unset } = _c, creatingDoc = __rest(_c, ["id", "$unset"]);
+                const result = yield this.customerModel.insertMany(creatingDoc, { rawResult: true });
+                const insertedId = (_b = (_a = result.insertedIds) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toHexString();
+                if (typeof insertedId !== 'string') {
+                    throw new factory.errors.Internal(`customer not saved unexpectedly. result:${JSON.stringify(result)}`);
+                }
+                savedId = insertedId;
             }
             else {
-                // 上書き禁止属性を除外(2022-08-24~)
-                const _a = params.attributes, { id, branchCode, project, typeOf } = _a, updateFields = __rest(_a, ["id", "branchCode", "project", "typeOf"]);
-                const doc = yield this.customerModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
+                const _d = params.attributes, { id, branchCode, project, typeOf, $unset } = _d, updateFields = __rest(_d, ["id", "branchCode", "project", "typeOf", "$unset"]);
+                const doc = yield this.customerModel.findOneAndUpdate({ _id: { $eq: params.id } }, Object.assign({ $set: updateFields }, ($unset !== undefined) ? { $unset } : undefined), { upsert: false, new: true, projection: { _id: 1, id: { $toString: '$_id' } } })
+                    .lean()
                     .exec();
                 if (doc === null) {
                     throw new factory.errors.NotFound(this.customerModel.modelName);
                 }
-                customer = doc.toObject();
+                savedId = params.id;
             }
-            return customer;
+            return { id: savedId };
         });
     }
     /**
      * 顧客検索
      */
-    search(conditions, projection) {
+    projectFields(conditions, inclusion, exclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = CustomerRepo.CREATE_MONGO_CONDITIONS(conditions);
-            const query = this.customerModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+            }
+            else {
+                if (Array.isArray(exclusion) && exclusion.length > 0) {
+                    positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
+                }
+            }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            const query = this.customerModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, projection);
             if (typeof conditions.limit === 'number' && conditions.limit > 0) {
                 const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
                 query.limit(conditions.limit)
@@ -105,13 +132,13 @@ class CustomerRepo {
                 query.sort({ branchCode: conditions.sort.branchCode });
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // 2024-09-03~
+                .exec();
         });
     }
     deleteById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.customerModel.findOneAndRemove({ _id: params.id })
+            yield this.customerModel.findOneAndRemove({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
                 .exec();
         });
     }

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

@@ -5,6 +5,6 @@ type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "Account";
-declare function createSchema(): ISchema;
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): ISchema;
 export { createSchema, IModel, indexes, modelName };

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

@@ -6,7 +6,18 @@ const writeConcern_1 = require("../writeConcern");
 const settings_1 = require("../../../settings");
 const modelName = 'Account';
 exports.modelName = modelName;
-const schemaDefinition = {};
+const schemaDefinition = {
+    project: mongoose_1.SchemaTypes.Mixed,
+    typeOf: String,
+    accountType: String,
+    accountNumber: String,
+    name: String,
+    balance: Number,
+    availableBalance: Number,
+    pendingTransactions: [mongoose_1.SchemaTypes.Mixed],
+    openDate: Date,
+    closeDate: Date
+};
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
     autoCreate: false,
@@ -14,7 +25,7 @@ const schemaOptions = {
     id: true,
     read: settings_1.MONGO_READ_PREFERENCE,
     writeConcern: writeConcern_1.writeConcern,
-    strict: false,
+    strict: true,
     strictQuery: false,
     timestamps: {
         createdAt: 'createdAt',
@@ -33,17 +44,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 = [
     // 口座タイプと口座番号でユニーク
     [
@@ -108,3 +108,19 @@ 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 === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}
+exports.createSchema = createSchema;

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

@@ -19,6 +19,6 @@ type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "AccountingReport";
-declare function createSchema(): ISchema;
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): ISchema;
 export { createSchema, IModel, indexes, modelName };

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

@@ -19,7 +19,7 @@ const schemaOptions = {
     id: true,
     read: settings_1.MONGO_READ_PREFERENCE,
     writeConcern: writeConcern_1.writeConcern,
-    strict: false,
+    strict: true,
     strictQuery: false,
     timestamps: false,
     versionKey: false,
@@ -36,17 +36,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 = [
     [
         { 'mainEntity.orderDate': -1 },
@@ -138,3 +127,19 @@ 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 === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}
+exports.createSchema = createSchema;

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

@@ -5,6 +5,6 @@ type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "MerchantReturnPolicy";
-declare function createSchema(): ISchema;
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): ISchema;
 export { createSchema, IModel, indexes, modelName };

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

@@ -27,10 +27,8 @@ const schemaOptions = {
     writeConcern: writeConcern_1.writeConcern,
     strict: true,
     strictQuery: false,
-    timestamps: {
-        createdAt: 'createdAt',
-        updatedAt: 'updatedAt'
-    },
+    timestamps: false,
+    versionKey: false,
     toJSON: {
         getters: false,
         virtuals: false,
@@ -44,6 +42,8 @@ const schemaOptions = {
         versionKey: false
     }
 };
+const indexes = [];
+exports.indexes = indexes;
 /**
  * 返品ポリシースキーマ
  */
@@ -51,18 +51,12 @@ 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;
-const indexes = [
-    [
-        { createdAt: 1 },
-        { name: 'searchByCreatedAt' }
-    ],
-    [
-        { updatedAt: 1 },
-        { name: 'searchByUpdatedAt' }
-    ]
-];
-exports.indexes = indexes;

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.3.0-alpha.3"
+  "version": "22.3.0-alpha.5"
 }