@chevre/domain 22.2.0-alpha.8 → 22.2.0

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

@@ -1,5 +1,10 @@
-import { IndexDefinition, IndexOptions, Schema } from 'mongoose';
+import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
+import * as factory from '../../../factory';
+type IDocType = Omit<factory.task.ITask<factory.taskName>, 'id'>;
+type IModel = Model<IDocType>;
+type ISchemaDefinition = SchemaDefinition<IDocType>;
+type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "Task";
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
-declare function createSchema(): Schema;
-export { modelName, indexes, createSchema };
+declare function createSchema(): ISchema;
+export { createSchema, IModel, indexes, modelName };

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSchema = exports.indexes = exports.modelName = void 0;
+exports.modelName = exports.indexes = exports.createSchema = void 0;
 const mongoose_1 = require("mongoose");
 const writeConcern_1 = require("../writeConcern");
 const settings_1 = require("../../../settings");

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

@@ -1,5 +1,9 @@
-import { IndexDefinition, IndexOptions, Schema } from 'mongoose';
+import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
+type IDocType = any;
+type IModel = Model<IDocType>;
+type ISchemaDefinition = SchemaDefinition<IDocType>;
+type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "Telemetry";
-declare function createSchema(): Schema;
+declare function createSchema(): ISchema;
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
-export { modelName, indexes, createSchema };
+export { createSchema, IModel, indexes, modelName };

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

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSchema = exports.indexes = exports.modelName = void 0;
+exports.modelName = exports.indexes = exports.createSchema = void 0;
 const mongoose_1 = require("mongoose");
 const writeConcern_1 = require("../writeConcern");
+// import * as factory from '../../../factory';
 const settings_1 = require("../../../settings");
 const modelName = 'Telemetry';
 exports.modelName = modelName;

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

@@ -1,5 +1,28 @@
-import { IndexDefinition, IndexOptions, Schema } from 'mongoose';
+import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
+import * as factory from '../../../factory';
+export interface ITicketIssuedBy {
+    id: string;
+    typeOf: factory.organizationType.Corporation | factory.organizationType.Project;
+}
+export interface ITicket {
+    /**
+     * チケットID(jti)
+     */
+    id: string;
+    project: {
+        id: string;
+        typeOf: factory.organizationType.Project;
+    };
+    typeOf: 'Ticket';
+    ticketToken: string;
+    dateIssued: Date;
+    issuedBy: ITicketIssuedBy;
+}
+type IDocType = Omit<ITicket, 'id'>;
+type IModel = Model<IDocType>;
+type ISchemaDefinition = SchemaDefinition<IDocType>;
+type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "Ticket";
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
-declare function createSchema(): Schema;
-export { modelName, indexes, createSchema };
+declare function createSchema(): ISchema;
+export { createSchema, IModel, indexes, modelName };

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSchema = exports.indexes = exports.modelName = void 0;
+exports.modelName = exports.indexes = exports.createSchema = void 0;
 const mongoose_1 = require("mongoose");
 const writeConcern_1 = require("../writeConcern");
 const settings_1 = require("../../../settings");

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

@@ -1,5 +1,10 @@
-import { IndexDefinition, IndexOptions, Schema } from 'mongoose';
+import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
+import * as factory from '../../../factory';
+type IDocType = factory.transaction.ITransaction<factory.transactionType>;
+type IModel = Model<IDocType>;
+type ISchemaDefinition = SchemaDefinition<IDocType>;
+type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "Transaction";
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
-declare function createSchema(): Schema;
-export { modelName, indexes, createSchema };
+declare function createSchema(): ISchema;
+export { createSchema, IModel, indexes, modelName };

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSchema = exports.indexes = exports.modelName = void 0;
+exports.modelName = exports.indexes = exports.createSchema = void 0;
 const mongoose_1 = require("mongoose");
-const factory = require("../../../factory");
 const writeConcern_1 = require("../writeConcern");
+const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
 const modelName = 'Transaction';
 exports.modelName = modelName;

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

@@ -1,5 +1,10 @@
-import { IndexDefinition, IndexOptions, Schema } from 'mongoose';
+import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
+import * as factory from '../../../factory';
+type IDocType = Omit<factory.trip.ITrip<factory.tripType>, 'id'>;
+type IModel = Model<IDocType>;
+type ISchemaDefinition = SchemaDefinition<IDocType>;
+type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "Trip";
-declare function createSchema(): Schema;
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
-export { modelName, indexes, createSchema };
+declare function createSchema(): ISchema;
+export { createSchema, IModel, indexes, modelName };

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSchema = exports.indexes = exports.modelName = void 0;
+exports.modelName = exports.indexes = exports.createSchema = void 0;
 const mongoose_1 = require("mongoose");
 const writeConcern_1 = require("../writeConcern");
 const settings_1 = require("../../../settings");
@@ -39,6 +39,8 @@ const schemaOptions = {
         versionKey: false
     }
 };
+const indexes = [];
+exports.indexes = indexes;
 /**
  * トリップスキーマ
  */
@@ -50,5 +52,3 @@ function createSchema() {
     return schema;
 }
 exports.createSchema = createSchema;
-const indexes = [];
-exports.indexes = indexes;

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

@@ -23,8 +23,9 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import type { BulkWriteResult } from 'mongodb';
-import { AnyExpression, Connection, PipelineStage } from 'mongoose';
+import { AnyExpression, Connection, Document, PipelineStage } from 'mongoose';
 import * as factory from '../factory';
+import { IDocType as IAggregateOfferDocType } from './mongoose/schemas/aggregateOffer';
 type IMatchStage = PipelineStage.Match;
 type KeyOfUnitPriceOffer = keyof Omit<factory.unitPriceOffer.IUnitPriceOffer, 'id'>;
 type IProjection = {
@@ -216,7 +217,11 @@ export declare class OfferRepo {
             };
         };
     }): Promise<import("mongodb").UpdateResult | undefined>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<Document<unknown, {}, IAggregateOfferDocType> & Omit<IAggregateOfferDocType & Required<{
+        _id: string;
+    }>, never>, import("mongoose").QueryOptions<Document<unknown, {}, IAggregateOfferDocType> & Omit<IAggregateOfferDocType & Required<{
+        _id: string;
+    }>, never>>>;
     addAvailableAtOrFrom(params: {
         id: string;
         identifier: string;
@@ -225,7 +230,9 @@ export declare class OfferRepo {
                 id: string;
             };
         };
-    }): Promise<any>;
+    }): Promise<(Document<unknown, {}, IAggregateOfferDocType> & Omit<IAggregateOfferDocType & Required<{
+        _id: string;
+    }>, never>) | null>;
     deleteAvailableAtOrFrom(params: {
         id: string;
         offers: {
@@ -233,7 +240,9 @@ export declare class OfferRepo {
                 id: string;
             };
         };
-    }): Promise<any>;
+    }): Promise<(Document<unknown, {}, IAggregateOfferDocType> & Omit<IAggregateOfferDocType & Required<{
+        _id: string;
+    }>, never>) | null>;
     /**
      * サブカタログから集計オファーIDリストを検索する
      */

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

@@ -23,8 +23,9 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import type { BulkWriteResult } from 'mongodb';
-import type { Connection } from 'mongoose';
+import type { Connection, Document } from 'mongoose';
 import * as factory from '../factory';
+import { IDocType } from './mongoose/schemas/offerCatalog';
 export type IAggregatedOfferCatalog = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'project' | 'typeOf' | 'identifier' | 'itemOffered' | 'additionalProperty'> & {
     numberOfItems?: number;
     itemListElementTypeOf: factory.offerType.Offer | 'OfferCatalog';
@@ -136,5 +137,17 @@ export declare class OfferCatalogRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<Document<unknown, {}, IDocType> & Omit<factory.offerCatalog.IOfferCatalog & {
+        _id: string;
+        alternateName?: any;
+        dateSynced?: Date | undefined;
+    } & Required<{
+        _id: string;
+    }>, never>, import("mongoose").QueryOptions<Document<unknown, {}, IDocType> & Omit<factory.offerCatalog.IOfferCatalog & {
+        _id: string;
+        alternateName?: any;
+        dateSynced?: Date | undefined;
+    } & Required<{
+        _id: string;
+    }>, never>>>;
 }

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

@@ -160,7 +160,19 @@ export declare class OrderRepo {
     }): Promise<(IOrderWithoutAcceptedOffers & {
         id: string;
     })[]>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, Omit<factory.order.IOrder, "id"> & {
+        acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered>[] | undefined;
+    }> & Omit<Omit<factory.order.IOrder, "id"> & {
+        acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered>[] | undefined;
+    } & {
+        _id: import("mongoose").Types.ObjectId;
+    }, never>, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, Omit<factory.order.IOrder, "id"> & {
+        acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered>[] | undefined;
+    }> & Omit<Omit<factory.order.IOrder, "id"> & {
+        acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered>[] | undefined;
+    } & {
+        _id: import("mongoose").Types.ObjectId;
+    }, never>>>;
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<factory.order.IOrder>;
         $unset: any;

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

@@ -46,7 +46,7 @@ export declare class OwnershipInfoRepo {
     /**
      * 所有権を検索する
      */
-    search(params: factory.ownershipInfo.ISearchConditions, projection?: any): Promise<IOwnershipInfoWithId[]>;
+    projectFields(params: factory.ownershipInfo.ISearchConditions, inclusion?: (keyof IOwnershipInfoWithId)[]): Promise<IOwnershipInfoWithId[]>;
     /**
      * 識別子から所有期限を変更する
      * 存在しない場合undefinedを返す
@@ -57,7 +57,7 @@ export declare class OwnershipInfoRepo {
         };
         identifier: string;
         ownedThrough: Date;
-    }): Promise<IOwnershipInfoWithId | undefined>;
+    }): Promise<Pick<IOwnershipInfoWithId, 'id' | 'identifier'> | undefined>;
     /**
      * 所有者の所有権を全て削除する
      */
@@ -97,7 +97,19 @@ export declare class OwnershipInfoRepo {
             $lt: Date;
         };
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood> & {
+        _id: string;
+    }> & Omit<factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood> & {
+        _id: string;
+    } & Required<{
+        _id: string;
+    }>, never>, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood> & {
+        _id: string;
+    }> & Omit<factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood> & {
+        _id: string;
+    } & Required<{
+        _id: string;
+    }>, never>>>;
     /**
      * 所有者を追加する
      */

package/lib/chevre/repo/ownershipInfo.js

@@ -270,7 +270,6 @@ class OwnershipInfoRepo {
                 throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);
             }
             return { id: doc.id };
-            // return <IOwnershipInfo>doc.toObject();
         });
     }
     projectFieldsById(params, inclusion) {
@@ -300,17 +299,34 @@ class OwnershipInfoRepo {
                 throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);
             }
             return doc;
-            // return doc.toObject();
         });
     }
     /**
      * 所有権を検索する
      */
-    search(params, projection) {
+    projectFields(params, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = OwnershipInfoRepo.CREATE_MONGO_CONDITIONS(params);
-            const query = this.ownershipInfoModel.find((conditions.length > 0) ? { $and: conditions } : {}, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
+            let projection = {
+                _id: 0,
+                id: { $toString: '$_id' },
+                project: 1,
+                typeOf: 1,
+                identifier: 1,
+                ownedBy: 1,
+                acquiredFrom: 1,
+                ownedFrom: 1,
+                ownedThrough: 1,
+                typeOfGood: 1
+            };
+            const positiveProjectionFields = (Array.isArray(inclusion))
+                ? inclusion.filter((key) => key !== 'id' && String(key) !== '_id')
+                : undefined;
+            if (Array.isArray(positiveProjectionFields)) {
+                projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            }
+            const query = this.ownershipInfoModel.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)
@@ -322,8 +338,8 @@ class OwnershipInfoRepo {
                 query.sort({ ownedFrom: params.sort.ownedFrom });
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // lean(2024-08-19~)
+                .exec();
         });
     }
     /**
@@ -335,8 +351,15 @@ class OwnershipInfoRepo {
             return this.ownershipInfoModel.findOneAndUpdate({
                 'project.id': { $eq: params.project.id },
                 identifier: { $eq: String(params.identifier) }
-            }, { ownedThrough: params.ownedThrough }, { new: true })
-                .select({ __v: 0, createdAt: 0, updatedAt: 0 })
+            }, { ownedThrough: params.ownedThrough }, {
+                new: true,
+                projection: {
+                    _id: 0,
+                    id: { $toString: '$_id' },
+                    identifier: 1
+                }
+            })
+                .lean()
                 .exec()
                 .then((doc) => {
                 // 存在しない場合も正常にハンドルする
@@ -344,7 +367,7 @@ class OwnershipInfoRepo {
                     return;
                 }
                 else {
-                    return doc.toObject();
+                    return doc;
                 }
             });
         });
@@ -431,7 +454,10 @@ class OwnershipInfoRepo {
                 };
             }
             if (newOwner !== undefined) {
-                const doc = yield this.ownershipInfoModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $addToSet: { ownedBy: newOwner } }, { new: true })
+                const doc = yield this.ownershipInfoModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $addToSet: { ownedBy: newOwner } }, {
+                    new: true,
+                    projection: { _id: 1 }
+                })
                     .exec();
                 if (doc === null) {
                     throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);
@@ -447,7 +473,10 @@ class OwnershipInfoRepo {
             if (typeof params.ownedBy.id !== 'string' || params.ownedBy.id.length === 0) {
                 throw new factory.errors.ArgumentNull('ownedBy.id');
             }
-            const doc = yield this.ownershipInfoModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $pull: { ownedBy: { id: params.ownedBy.id } } }, { new: true })
+            const doc = yield this.ownershipInfoModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $pull: { ownedBy: { id: params.ownedBy.id } } }, {
+                new: true,
+                projection: { _id: 1 }
+            })
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);

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

@@ -1,7 +1,7 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 type IUnsetKey = keyof Pick<factory.service.paymentService.IService, 'additionalProperty' | 'availableChannel' | 'serviceOutput' | 'serviceType'>;
-type IKeyOfProjection4paymentService = keyof factory.service.paymentService.IService | '_id';
+type IKeyOfProjection4paymentService = keyof factory.service.paymentService.IService;
 /**
  * 決済サービス検索条件
  */
@@ -37,7 +37,7 @@ export declare class PaymentServiceRepo {
     /**
      * 決済サービスを検索する
      */
-    searchPaymentServices(conditions: ISearchConditions4paymentService, inclusion: IKeyOfProjection4paymentService[], exclusion: IKeyOfProjection4paymentService[]): Promise<(factory.service.paymentService.IService & {
+    projectFields(conditions: ISearchConditions4paymentService, inclusion: IKeyOfProjection4paymentService[], exclusion: IKeyOfProjection4paymentService[]): Promise<(factory.service.paymentService.IService & {
         id: string;
     })[]>;
     deletePaymentServiceById(params: {