@chevre/domain 22.2.0-alpha.2 → 22.2.0-alpha.20

package/example/src/chevre/playAroundTicket.ts

@@ -14,7 +14,7 @@ async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const ticketRepo = await chevre.repository.Ticket.createInstance(mongoose.connection);
-    const tickets = await ticketRepo.search(
+    const tickets = await ticketRepo.projectFields(
         {
             limit: 1,
             page: 1,
@@ -23,7 +23,8 @@ async function main() {
                 id: { $eq: project.id }
             },
             ticketToken: { $eq: TICKET_TOKEN }
-        }
+        },
+        []
     );
     console.log('tickets:', tickets);
     console.log(tickets.length, 'tickets found');

package/example/src/chevre/{projectReservationFields.ts → projectFields.ts}

@@ -5,25 +5,27 @@ import { chevre } from '../../../lib/index';
 
 const project = { id: String(process.env.PROJECT_ID) };
 
+mongoose.Model.on('index', (...args) => {
+    console.error('******** index event emitted. ********\n', args);
+});
+
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const reservationRepo = await chevre.repository.Reservation.createInstance(mongoose.connection);
+    const sellerRepo = await chevre.repository.Seller.createInstance(mongoose.connection);
 
-    const reservations = await reservationRepo.projectFields<chevre.factory.reservationType.EventReservation>(
+    const docs = await sellerRepo.projectFields(
         {
             limit: 1,
             page: 1,
-            typeOf: chevre.factory.reservationType.EventReservation,
             project: { id: { $eq: project.id } }
         },
-        {
-            id: 1
-        }
+        [],
+        ['hasMerchantReturnPolicy', 'makesOffer', 'additionalProperty']
     );
     // tslint:disable-next-line:no-null-keyword
-    console.dir(reservations, { depth: null });
-    console.log(reservations.length, 'reservations found');
+    console.dir(docs, { depth: null });
+    console.log(docs.length, 'docs found');
 }
 
 main()

package/example/src/chevre/{projectReservationFieldsById.ts → projectOwnershipInfoFieldsById.ts}

@@ -8,12 +8,12 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const reservationRepo = await chevre.repository.Reservation.createInstance(mongoose.connection);
-    const result = await reservationRepo.projectFieldsById(
+    const ownershipInfoRepo = await chevre.repository.OwnershipInfo.createInstance(mongoose.connection);
+    const result = await ownershipInfoRepo.projectFieldsById(
         {
-            id: '948926445022844-0',
-            inclusion: ['reservationStatus', 'reservationFor.id']
+            id: 'd9080760-1bdb-49cf-86eb-50f98fab0010'
         }
+        // ['id', 'typeOfGood']
     );
     // tslint:disable-next-line:no-null-keyword
     console.dir(result, { depth: null });

package/example/src/chevre/searchSellersByAggregate.ts

@@ -15,7 +15,7 @@ async function main() {
             limit: 5,
             page: 1,
             sort: { branchCode: chevre.factory.sortType.Descending },
-            id: { $eq: 'xxx' }
+            id: { $eq: '59d20831e53ebc2b4e774466' }
             // project: { id: { $eq: project.id } }
             // paymentAccepted: { paymentMethodType: { $eq: 'Cash' } },
             // hasMerchantReturnPolicy: { applicablePaymentMethod: {} }
@@ -26,12 +26,12 @@ async function main() {
     console.log('sellers found', sellersByAggregate, sellersByAggregate[0]?.hasMerchantReturnPolicy);
     console.log(sellersByAggregate.length, 'sellers found');
 
-    const sellers = await sellerRepo.search(
+    const sellers = await sellerRepo.projectFields(
         {
             limit: 5,
             page: 1,
             sort: { branchCode: chevre.factory.sortType.Descending },
-            id: { $eq: 'xxx' }
+            id: { $eq: '59d20831e53ebc2b4e774466' }
             // project: { id: { $eq: project.id } }
             // paymentAccepted: { paymentMethodType: { $eq: 'Cash' } },
             // hasMerchantReturnPolicy: { applicablePaymentMethod: {} }

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -6,13 +6,11 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const accountingReportRepo = await chevre.repository.AccountingReport.createInstance(mongoose.connection);
-    const aggregateReservationRepo = await chevre.repository.AggregateReservation.createInstance(mongoose.connection);
-    const reservationRepo = await chevre.repository.Reservation.createInstance(mongoose.connection);
-    const projectRepo = await chevre.repository.Project.createInstance(mongoose.connection);
+    const productRepo = await chevre.repository.Product.createInstance(mongoose.connection);
+    const sellerRepo = await chevre.repository.Seller.createInstance(mongoose.connection);
 
     let updateResult: any;
-    updateResult = await accountingReportRepo.unsetUnnecessaryFields({
+    updateResult = await productRepo.unsetUnnecessaryFields({
         filter: {
             _id: { $exists: true }
         },
@@ -24,31 +22,7 @@ async function main() {
     });
     console.log(updateResult);
 
-    updateResult = await aggregateReservationRepo.unsetUnnecessaryFields({
-        filter: {
-            _id: { $exists: true }
-        },
-        $unset: {
-            createdAt: 1,
-            updatedAt: 1,
-            __v: 1
-        }
-    });
-    console.log(updateResult);
-
-    updateResult = await projectRepo.unsetUnnecessaryFields({
-        filter: {
-            _id: { $exists: true }
-        },
-        $unset: {
-            createdAt: 1,
-            updatedAt: 1,
-            __v: 1
-        }
-    });
-    console.log(updateResult);
-
-    updateResult = await reservationRepo.unsetUnnecessaryFields({
+    updateResult = await sellerRepo.unsetUnnecessaryFields({
         filter: {
             _id: { $exists: true }
         },

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

@@ -36,7 +36,9 @@ export declare class AuthorizationRepo {
         };
         id: string;
     }): Promise<Pick<IFindValidOneResult, 'object'>>;
-    search(params: factory.authorization.ISearchConditions): Promise<factory.authorization.IAuthorization[]>;
+    projectFields(params: factory.authorization.ISearchConditions): Promise<(factory.authorization.IAuthorization & {
+        id: string;
+    })[]>;
     /**
      * 有効期限を一定期間過ぎた承認を削除する
      */

package/lib/chevre/repo/authorization.js

@@ -114,14 +114,17 @@ class AuthorizationRepo {
                 code: { $eq: String(params.code) },
                 validFrom: { $lte: now },
                 validUntil: { $gte: now }
-            }, { object: 1, _id: 1, typeOf: 1, audience: 1, issuedBy: 1 })
-                // projection的にleanで十分
-                // .lean<Pick<factory.authorization.IAuthorization, 'object'>>()
+            }, {
+                _id: 0,
+                id: { $toString: '$_id' },
+                object: 1, typeOf: 1, audience: 1, issuedBy: 1
+            })
+                .lean()
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.authorizationModel.modelName);
             }
-            const { id, object, typeOf, audience, issuedBy } = doc.toObject();
+            const { id, object, typeOf, audience, issuedBy } = doc;
             return Object.assign(Object.assign({ id, object, typeOf }, (typeof (issuedBy === null || issuedBy === void 0 ? void 0 : issuedBy.id) === 'string') ? { issuedBy } : undefined), (typeof (audience === null || audience === void 0 ? void 0 : audience.id) === 'string') ? { audience } : undefined);
         });
     }
@@ -145,14 +148,22 @@ class AuthorizationRepo {
             return doc;
         });
     }
-    search(params) {
+    projectFields(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = AuthorizationRepo.CREATE_MONGO_CONDITIONS(params);
             const query = this.authorizationModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
-            // __v: 0,
-            // createdAt: 0,
-            // updatedAt: 0
+                _id: 0,
+                id: { $toString: '$_id' },
+                project: 1,
+                typeOf: 1,
+                code: 1,
+                object: 1,
+                validFrom: 1,
+                validUntil: 1,
+                audience: 1,
+                author: 1,
+                issuedBy: 1
             });
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
@@ -165,8 +176,8 @@ class AuthorizationRepo {
                 query.sort({ validFrom: params.sort.validFrom });
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean()
+                .exec();
         });
     }
     /**

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

@@ -45,13 +45,25 @@ export declare class CategoryCodeRepo {
     /**
      * 検索
      */
-    search(params: factory.categoryCode.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<factory.categoryCode.ICategoryCode[]>;
+    projectFields(params: factory.categoryCode.ISearchConditions, 
+    /**
+     * 空の場合無効
+     */
+    inclusion: IKeyOfProjection[], 
+    /**
+     * 空の場合無効
+     */
+    exclusion: IKeyOfProjection[]): Promise<(factory.categoryCode.ICategoryCode & {
+        id: string;
+    })[]>;
     save(params: {
         id?: string;
         attributes: factory.categoryCode.ICategoryCode & {
             $unset?: IUnset;
         };
-    }): Promise<factory.categoryCode.ICategoryCode>;
+    }): Promise<{
+        id: string;
+    }>;
     saveManyByCodeValue(params: {
         attributes: factory.categoryCode.ICategoryCode;
         upsert?: boolean;

package/lib/chevre/repo/categoryCode.js

@@ -25,6 +25,9 @@ const mongoose_1 = require("mongoose");
 const categoryCode_1 = require("./mongoose/schemas/categoryCode");
 const factory = require("../factory");
 const settings_1 = require("../settings");
+const AVAILABLE_PROJECT_FIELDS = [
+    'additionalProperty', 'codeValue', 'color', 'image', 'inCodeSet', 'name', 'paymentMethod', 'project', 'typeOf'
+];
 /**
  * 区分リポジトリ
  */
@@ -208,27 +211,43 @@ class CategoryCodeRepo {
     /**
      * 検索
      */
-    search(params, inclusion, exclusion) {
+    projectFields(params, 
+    /**
+     * 空の場合無効
+     */
+    inclusion, 
+    /**
+     * 空の場合無効
+     */
+    exclusion) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = CategoryCodeRepo.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;
-                    });
+                    positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
                 }
             }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            // 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.categoryCodeModel.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;
@@ -241,27 +260,30 @@ class CategoryCodeRepo {
                 query.sort(params.sort);
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // 2024-08-19~
+                .exec();
         });
     }
     save(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            let savedId;
             let doc;
             if (typeof params.id !== 'string') {
                 const _a = params.attributes, { id, $unset } = _a, creatingDoc = __rest(_a, ["id", "$unset"]);
-                doc = yield this.categoryCodeModel.create(creatingDoc);
+                doc = (yield this.categoryCodeModel.create(creatingDoc));
+                savedId = doc.id;
             }
             else {
                 // 上書き禁止属性を除外(2022-08-24~)
                 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 })
+                doc = yield this.categoryCodeModel.findOneAndUpdate({ _id: { $eq: params.id } }, Object.assign({ $set: updateFields }, ($unset !== undefined) ? { $unset } : undefined), { upsert: false, new: true, projection: { _id: 1 } })
                     .exec();
+                savedId = params.id;
             }
             if (doc === null) {
                 throw new factory.errors.NotFound(this.categoryCodeModel.modelName);
             }
-            return doc.toObject();
+            return { id: savedId };
         });
     }
     saveManyByCodeValue(params) {
@@ -302,7 +324,7 @@ class CategoryCodeRepo {
      */
     deleteById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.categoryCodeModel.findOneAndRemove({ _id: params.id })
+            yield this.categoryCodeModel.findOneAndRemove({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
                 .exec();
         });
     }

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

@@ -69,11 +69,20 @@ const indexes = [
         }
     ],
     [
-        { 'serviceOutput.amount.currency': 1, productID: 1 },
+        { 'serviceOutput.paymentMethod.amount.currency': 1, productID: 1 },
         {
-            name: 'searchByServiceOutputAmountCurrency',
+            name: 'searchByServiceOutputPaymentMethodAmountCurrency',
             partialFilterExpression: {
-                'serviceOutput.amount.currency': { $exists: true }
+                'serviceOutput.paymentMethod.amount.currency': { $exists: true }
+            }
+        }
+    ],
+    [
+        { 'serviceOutput.issuedThrough.serviceType.codeValue': 1, productID: 1 },
+        {
+            name: 'searchByServiceOutputIssuedThroughServiceType',
+            partialFilterExpression: {
+                'serviceOutput.issuedThrough.serviceType.codeValue': { $exists: true }
             }
         }
     ],

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

@@ -19,6 +19,9 @@ const schemaDefinition = {
     // provider: [SchemaTypes.Mixed], // 廃止(2024-04-12~)
     serviceOutput: mongoose_1.SchemaTypes.Mixed,
     serviceType: mongoose_1.SchemaTypes.Mixed
+    // createdAt: SchemaTypes.Mixed,
+    // updatedAt: SchemaTypes.Mixed,
+    // __v: SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -29,10 +32,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,
@@ -47,14 +48,6 @@ const schemaOptions = {
     }
 };
 const indexes = [
-    [
-        { createdAt: 1 },
-        { name: 'searchByCreatedAt' }
-    ],
-    [
-        { updatedAt: 1 },
-        { name: 'searchByUpdatedAt' }
-    ],
     [
         { productID: 1 },
         { name: 'searchByProductID' }

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

@@ -1,5 +1,5 @@
 import { IndexDefinition, IndexOptions, Schema } from 'mongoose';
 declare const modelName = "Seller";
-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/seller.js

@@ -22,6 +22,9 @@ const schemaDefinition = {
     },
     url: String,
     telephone: String
+    // createdAt: SchemaTypes.Mixed,
+    // updatedAt: SchemaTypes.Mixed,
+    // __v: SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -32,10 +35,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,
@@ -49,26 +50,7 @@ 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 },
-        { name: 'searchByCreatedAt' }
-    ],
-    [
-        { updatedAt: 1 },
-        { name: 'searchByUpdatedAt' }
-    ],
     [
         { branchCode: 1 },
         { name: 'searchByBranchCode' }
@@ -139,3 +121,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/ownershipInfo.d.ts

@@ -24,7 +24,9 @@
 /// <reference types="mongoose/types/inferschematype" />
 import type { Connection } from 'mongoose';
 import * as factory from '../factory';
-export type IOwnershipInfo = factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood>;
+export type IOwnershipInfoWithId = factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood> & {
+    id: string;
+};
 /**
  * 所有権リポジトリ
  */
@@ -35,14 +37,16 @@ export declare class OwnershipInfoRepo {
     /**
      * なければ作成する
      */
-    createIfNotExistByIdentifier(ownershipInfo: IOwnershipInfo): Promise<IOwnershipInfo>;
-    findById(params: {
+    createIfNotExistByIdentifier(ownershipInfo: Omit<IOwnershipInfoWithId, 'id'>): Promise<{
         id: string;
-    }, projection?: any): Promise<IOwnershipInfo>;
+    }>;
+    projectFieldsById(params: {
+        id: string;
+    }, inclusion?: (keyof IOwnershipInfoWithId)[]): Promise<IOwnershipInfoWithId>;
     /**
      * 所有権を検索する
      */
-    search(params: factory.ownershipInfo.ISearchConditions, projection?: any): Promise<IOwnershipInfo[]>;
+    projectFields(params: factory.ownershipInfo.ISearchConditions, inclusion?: (keyof IOwnershipInfoWithId)[]): Promise<IOwnershipInfoWithId[]>;
     /**
      * 識別子から所有期限を変更する
      * 存在しない場合undefinedを返す
@@ -53,7 +57,7 @@ export declare class OwnershipInfoRepo {
         };
         identifier: string;
         ownedThrough: Date;
-    }): Promise<IOwnershipInfo | undefined>;
+    }): Promise<Pick<IOwnershipInfoWithId, 'id' | 'identifier'> | undefined>;
     /**
      * 所有者の所有権を全て削除する
      */