@chevre/domain 22.3.0 → 22.4.0-alpha.0

package/example/src/chevre/findItemListElementById.ts

@@ -0,0 +1,23 @@
+// 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 offerCatalogRepo = await chevre.repository.OfferCatalog.createInstance(mongoose.connection);
+
+    const result = await offerCatalogRepo.findItemListElementById({
+        id: 'blpc770py',
+        project: { id: project.id }
+    });
+    console.log(result);
+    console.log(result.itemListElement.length);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/projectFields.ts

@@ -8,15 +8,15 @@ const project = { id: String(process.env.PROJECT_ID) };
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const additionalPropertyRepo = await chevre.repository.AdditionalProperty.createInstance(mongoose.connection);
+    const repo = await chevre.repository.Member.createInstance(mongoose.connection);
 
-    const docs = await additionalPropertyRepo.projectFields(
+    const docs = await repo.projectFields(
         {
             limit: 1,
             page: 1,
             project: { id: { $eq: project.id } }
         },
-        ['id', 'codeValue', 'name']
+        ['member']
     );
     // tslint:disable-next-line:no-null-keyword
     console.dir(docs, { depth: null });

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

@@ -2,7 +2,7 @@ import type { BulkWriteResult } from 'mongodb';
 import { Connection, FilterQuery } from 'mongoose';
 import { ICustomerType } from './mongoose/schemas/customerType';
 import * as factory from '../factory';
-type IKeyOfProjection = keyof ICustomerType | '_id';
+type IKeyOfProjection = keyof ICustomerType;
 /**
  * カスタマータイプリポジトリ
  */
@@ -13,7 +13,7 @@ export declare class CustomerTypeRepo {
     /**
      * 検索
      */
-    search(params: factory.categoryCode.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<ICustomerType[]>;
+    projectFields(params: factory.categoryCode.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<ICustomerType[]>;
     saveManyByCodeValue(params: {
         attributes: ICustomerType;
         upsert?: boolean;

package/lib/chevre/repo/customerType.js

@@ -12,6 +12,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomerTypeRepo = void 0;
 const customerType_1 = require("./mongoose/schemas/customerType");
 const settings_1 = require("../settings");
+const AVAILABLE_PROJECT_FIELDS = [
+    'typeOf',
+    'codeValue',
+    'name'
+];
 /**
  * カスタマータイプリポジトリ
  */
@@ -25,52 +30,40 @@ class CustomerTypeRepo {
         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 } });
+            andConditions.push({ codeValue: { $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 } });
+            andConditions.push({ codeValue: { $in: codeValueIn } });
         }
         return andConditions;
     }
     /**
      * 検索
      */
-    search(params, inclusion, exclusion) {
+    projectFields(params, inclusion) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = CustomerTypeRepo.CREATE_MONGO_CONDITIONS(params);
-            let projection = {};
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
             if (Array.isArray(inclusion) && inclusion.length > 0) {
-                inclusion.forEach((field) => {
-                    projection[field] = 1;
-                });
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
             else {
-                projection = {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
-                };
-                if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    exclusion.forEach((field) => {
-                        projection[field] = 0;
-                    });
-                }
+                // no op
             }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
             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()));
+                .lean()
+                .exec();
         });
     }
     saveManyByCodeValue(params) {

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

@@ -24,6 +24,7 @@
 /// <reference types="mongoose/types/inferschematype" />
 import type { Connection } from 'mongoose';
 import * as factory from '../factory';
+type IKeyOfProjection = keyof factory.iam.IMember;
 /**
  * IAMメンバーリポジトリ
  */
@@ -31,7 +32,7 @@ export declare class MemberRepo {
     private readonly memberModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.iam.ISearchConditions): any[];
-    search(params: factory.iam.ISearchConditions): Promise<factory.iam.IMember[]>;
+    projectFields(params: factory.iam.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.iam.IMember[]>;
     aggregateRoleNames(params: {
         project: {
             id: {
@@ -62,7 +63,7 @@ export declare class MemberRepo {
     /**
      * メンバー作成
      */
-    create(params: factory.iam.IMember[]): Promise<factory.iam.IMember[]>;
+    create(params: factory.iam.IMember[]): Promise<void>;
     /**
      * メンバー更新
      */
@@ -163,3 +164,4 @@ export declare class MemberRepo {
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
 }
+export {};

package/lib/chevre/repo/member.js

@@ -11,8 +11,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemberRepo = void 0;
 const factory = require("../factory");
-const member_1 = require("./mongoose/schemas/member");
 const settings_1 = require("../settings");
+const member_1 = require("./mongoose/schemas/member");
+const AVAILABLE_PROJECT_FIELDS = [
+    'project',
+    'typeOf',
+    'member'
+];
 /**
  * IAMメンバーリポジトリ
  */
@@ -72,29 +77,31 @@ class MemberRepo {
         }
         return andConditions;
     }
-    search(params) {
+    projectFields(params, inclusion) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MemberRepo.CREATE_MONGO_CONDITIONS(params);
-            const query = this.memberModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
-            });
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+            }
+            else {
+                // no op
+            }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            const query = this.memberModel.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);
             }
             // const explainResult = await (<any>query).explain();
             // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean()
+                .exec();
         });
     }
     aggregateRoleNames(params) {
@@ -139,21 +146,21 @@ class MemberRepo {
      */
     create(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let members = [];
+            // let members: factory.iam.IMember[] = [];
             if (params.length > 0) {
-                const docs = yield this.memberModel.insertMany(params.map((p) => {
+                // const docs = await this.memberModel.insertMany(params.map((p) => {
+                yield this.memberModel.insertMany(params.map((p) => {
                     return {
                         project: p.project,
                         typeOf: p.typeOf,
                         member: p.member
                     };
                 }));
-                members = docs.map((doc) => doc.toObject());
             }
             else {
                 // no op
             }
-            return members;
+            // return members;
         });
     }
     /**

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

@@ -35,16 +35,7 @@ const schemaOptions = {
         versionKey: false
     }
 };
-const indexes = [
-// [ // discontinue(2024-08-07~)
-//     { createdAt: 1 },
-//     { name: 'searchByCreatedAt' }
-// ],
-// [
-//     { updatedAt: 1 },
-//     { name: 'searchByUpdatedAt' }
-// ]
-];
+const indexes = [];
 exports.indexes = indexes;
 /**
  * カスタマータイプスキーマ

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

@@ -111,7 +111,11 @@ export declare class OfferCatalogRepo {
         project: {
             id: string;
         };
-    }): Promise<Pick<factory.offerCatalog.IOfferCatalog, 'itemListElement'>>;
+    }): Promise<{
+        itemListElement: {
+            id: string;
+        }[];
+    }>;
     /**
      * 一つ目のitemListElementを取得する
      */

package/lib/chevre/repo/offerCatalog.js

@@ -134,22 +134,25 @@ class OfferCatalogRepo {
     }
     save(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            let savedId;
             let doc;
-            if (params.id === '') {
+            if (typeof params.id !== 'string' || params.id === '') {
                 const uniqid = yield Promise.resolve().then(() => require('uniqid'));
                 const newId = uniqid();
                 const { id, $unset } = params, creatingDoc = __rest(params, ["id", "$unset"]);
                 doc = yield this.offerCatalogModel.create(Object.assign(Object.assign({}, creatingDoc), { _id: newId }));
+                savedId = newId;
             }
             else {
                 const { id, identifier, itemOffered, project, typeOf, $unset } = params, updateFields = __rest(params, ["id", "identifier", "itemOffered", "project", "typeOf", "$unset"]); // 上書き禁止属性を除外
                 doc = yield this.offerCatalogModel.findOneAndUpdate({ _id: { $eq: params.id } }, Object.assign({ $set: updateFields }, (params.$unset !== undefined) ? { $unset: params.$unset } : undefined), { upsert: false, new: true, projection: { _id: 1 } })
                     .exec();
+                savedId = id;
             }
             if (doc === null) {
                 throw new factory.errors.NotFound(this.offerCatalogModel.modelName);
             }
-            return doc.toObject();
+            return { id: savedId };
         });
     }
     /**
@@ -166,9 +169,14 @@ class OfferCatalogRepo {
             }, {
                 $set: updateFields,
                 $setOnInsert: { _id: newId, identifier, itemOffered, project, typeOf }
-            }, { upsert: true, new: true, projection: { _id: 1 } })
+            }, {
+                upsert: true,
+                new: true,
+                projection: { _id: 0, id: '$_id' }
+            })
+                .lean()
                 .exec();
-            return doc.toObject();
+            return { id: doc.id };
         });
     }
     /**
@@ -333,12 +341,13 @@ class OfferCatalogRepo {
             const doc = yield this.offerCatalogModel.findOne({
                 'project.id': { $eq: params.project.id },
                 _id: { $eq: params.id }
-            }, { 'itemListElement.id': 1 })
+            }, { 'itemListElement.id': 1, _id: 0 })
+                .lean() // lean(2024-09-24~)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.offerCatalogModel.modelName);
             }
-            return doc.toObject();
+            return doc;
         });
     }
     /**

package/lib/chevre/service/transaction/placeOrder/start/validateStartRequest.js

@@ -103,14 +103,14 @@ function validateStartRequest(params) {
             }
         }
         // IAM存在検証(2024-02-06~)
-        const iamMember = (yield repos.member.search({
+        const iamMember = (yield repos.member.projectFields({
             project: { id: { $eq: seller.project.id } },
             member: {
                 typeOf: { $eq: factory.creativeWorkType.WebApplication },
                 id: { $eq: clientId },
                 memberOf: { typeOf: { $eq: factory.organizationType.Project } } // プロジェクトメンバーのはず
             }
-        })).shift();
+        }, ['member'])).shift();
         if (iamMember === undefined) {
             throw new factory.errors.NotFound(factory.iam.RoleType.OrganizationRole);
         }

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"
+  "version": "22.4.0-alpha.0"
 }

package/example/src/chevre/migrateMembers.ts

@@ -1,94 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const memberRepo = await chevre.repository.Member.createInstance(mongoose.connection);
-
-    const cursor = memberRepo.getCursor(
-        {
-            'member.memberOf.typeOf': { $eq: chevre.factory.organizationType.Corporation }
-        },
-        {
-        }
-    );
-    console.log('members found');
-
-    let projectIds: string[] = [];
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const iamMember: chevre.factory.iam.IMember = doc.toObject();
-
-        const alreadyMigrated = false;
-        projectIds.push(iamMember.project.id);
-
-        if (alreadyMigrated) {
-            console.log(
-                'already exist.',
-                iamMember.project.id,
-                iamMember.member.memberOf.typeOf, iamMember.member.memberOf.id, i, updateCount
-            );
-        } else {
-            console.log(
-                'updating...',
-                iamMember.project.id,
-                iamMember.member.memberOf.typeOf, iamMember.member.memberOf.id, i, updateCount
-            );
-            updateCount += 1;
-            console.log(
-                'updated.',
-                iamMember.project.id,
-                iamMember.member.memberOf.typeOf, iamMember.member.memberOf.id, i, updateCount
-            );
-        }
-    });
-
-    projectIds = [...new Set(projectIds)];
-    console.log(projectIds);
-    console.log(i, 'members checked');
-    console.log(updateCount, 'members updated');
-
-    // 販売者メンバーの存在するプロジェクトについて、inventoryManagerにiam.roleAdminを追加
-    const NEW_ROLE_NAME = 'iam.roleAdmin';
-    for (const projectId of projectIds) {
-        const inventoryManagers = await memberRepo.search({
-            project: { id: { $eq: projectId } },
-            member: {
-                hasRole: { roleName: { $eq: 'inventoryManager' } },
-                memberOf: { typeOf: { $eq: chevre.factory.organizationType.Project } }
-            }
-        });
-        console.log(inventoryManagers.length, 'inventoryManagers found', projectId);
-        for (const inventoryManager of inventoryManagers) {
-            const alreadyRoleAdmin = inventoryManager.member.hasRole.some(({ roleName }) => roleName === NEW_ROLE_NAME);
-            if (!alreadyRoleAdmin) {
-                const newHasRole: chevre.factory.iam.IMemberRole[] = [
-                    { typeOf: chevre.factory.iam.RoleType.OrganizationRole, roleName: NEW_ROLE_NAME },
-                    ...inventoryManager.member.hasRole
-                ];
-                console.log('adding newRole', projectId, inventoryManager.member.id, newHasRole);
-                await memberRepo.updateByMemberId({
-                    project: { id: inventoryManager.project.id },
-                    member: {
-                        id: inventoryManager.member.id,
-                        memberOf: inventoryManager.member.memberOf,
-                        hasRole: newHasRole
-                    },
-                    $unset: {}
-                });
-            }
-        }
-    }
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/searchCustomerTypes.ts

@@ -1,57 +0,0 @@
-// 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);