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

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

@@ -1,3 +1,27 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
 import type { AnyExpression, Connection, FilterQuery, PipelineStage } from 'mongoose';
 import * as factory from '../factory';
 type IMatchStage = PipelineStage.Match;
@@ -68,10 +92,10 @@ export declare class AggregateOfferRepo {
     /**
      * 単価オファー最適化作業における一時的な処理
      */
-    optimizeOffers(): Promise<import("mongodb").UpdateResult>;
+    optimizeOffers(): Promise<import("mongoose").UpdateWriteOpResult>;
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<factory.aggregateOffer.IAggregateOffer>;
         $unset: any;
-    }): Promise<import("mongodb").UpdateResult>;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
 }
 export {};

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

@@ -1,3 +1,27 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
 import type { Connection, PipelineStage } from 'mongoose';
 import * as factory from '../factory';
 import { IAggregateReservation } from './mongoose/schemas/aggregateReservation';
@@ -54,6 +78,6 @@ export declare class AggregateReservationRepo {
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;
-    }): Promise<import("mongodb").UpdateResult>;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
 }
 export {};

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

@@ -1,3 +1,27 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
 import type { Connection } from 'mongoose';
 import * as factory from '../factory';
 export declare enum AggregationType {
@@ -38,7 +62,7 @@ export interface IAggregation {
 export declare class AggregationRepo {
     private readonly aggregationModel;
     constructor(connection: Connection);
-    saveAggregation(params: IAggregation): Promise<import("mongodb").UpdateResult>;
+    saveAggregation(params: IAggregation): Promise<import("mongoose").UpdateWriteOpResult>;
     search(params: {
         limit: number;
         page: number;
@@ -64,5 +88,5 @@ export declare class AggregationRepo {
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;
-    }): Promise<import("mongodb").UpdateResult>;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
 }

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

@@ -268,7 +268,7 @@ export declare class AssetTransactionRepo {
     }): Promise<void>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, (import("@chevre/factory/lib/assetTransaction/cancelReservation").ITransaction | import("@chevre/factory/lib/assetTransaction/moneyTransfer").ITransaction | import("@chevre/factory/lib/assetTransaction/pay").ITransaction | import("@chevre/factory/lib/assetTransaction/refund").ITransaction | import("@chevre/factory/lib/assetTransaction/registerService").ITransaction | import("@chevre/factory/lib/assetTransaction/reserve").ITransaction) & {
         seller?: any;
-    }> & Omit<(import("@chevre/factory/lib/assetTransaction/cancelReservation").IAttributes & {
+    }> & ((import("@chevre/factory/lib/assetTransaction/cancelReservation").IAttributes & {
         id: string;
     } & {
         seller?: any;
@@ -304,9 +304,9 @@ export declare class AssetTransactionRepo {
         seller?: any;
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }), never>, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, (import("@chevre/factory/lib/assetTransaction/cancelReservation").ITransaction | import("@chevre/factory/lib/assetTransaction/moneyTransfer").ITransaction | import("@chevre/factory/lib/assetTransaction/pay").ITransaction | import("@chevre/factory/lib/assetTransaction/refund").ITransaction | import("@chevre/factory/lib/assetTransaction/registerService").ITransaction | import("@chevre/factory/lib/assetTransaction/reserve").ITransaction) & {
+    })), import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, (import("@chevre/factory/lib/assetTransaction/cancelReservation").ITransaction | import("@chevre/factory/lib/assetTransaction/moneyTransfer").ITransaction | import("@chevre/factory/lib/assetTransaction/pay").ITransaction | import("@chevre/factory/lib/assetTransaction/refund").ITransaction | import("@chevre/factory/lib/assetTransaction/registerService").ITransaction | import("@chevre/factory/lib/assetTransaction/reserve").ITransaction) & {
         seller?: any;
-    }> & Omit<(import("@chevre/factory/lib/assetTransaction/cancelReservation").IAttributes & {
+    }> & ((import("@chevre/factory/lib/assetTransaction/cancelReservation").IAttributes & {
         id: string;
     } & {
         seller?: any;
@@ -342,11 +342,11 @@ export declare class AssetTransactionRepo {
         seller?: any;
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }), never>>>;
+    }))>>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;
-    }): Promise<import("mongodb").UpdateResult>;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
     aggregateAssetTransaction(params: {
         project?: {
             id?: {

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

@@ -1,3 +1,27 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 type IFindValidOneResult = Pick<factory.authorization.IAuthorization, 'object' | 'typeOf' | 'audience' | 'issuedBy'> & {
@@ -48,7 +72,7 @@ export declare class AuthorizationRepo {
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<factory.authorization.IAuthorization>;
         $unset: any;
-    }): Promise<import("mongodb").UpdateResult>;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
     /**
      * コードを保管する
      */

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

@@ -86,6 +86,6 @@ export declare class CategoryCodeRepo {
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<factory.categoryCode.ICategoryCode>;
         $unset: any;
-    }): Promise<import("mongodb").UpdateResult>;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
 }
 export {};

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

@@ -54,9 +54,9 @@ export declare class CommentRepo {
     deleteById(params: {
         id: string;
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, import("@chevre/factory/lib/creativeWork/comment").IComment> & Omit<import("@chevre/factory/lib/creativeWork/comment").IComment & {
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, import("@chevre/factory/lib/creativeWork/comment").IComment> & import("@chevre/factory/lib/creativeWork/comment").IComment & {
         _id: import("mongoose").Types.ObjectId;
-    }, never>, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, import("@chevre/factory/lib/creativeWork/comment").IComment> & Omit<import("@chevre/factory/lib/creativeWork/comment").IComment & {
+    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, import("@chevre/factory/lib/creativeWork/comment").IComment> & import("@chevre/factory/lib/creativeWork/comment").IComment & {
         _id: import("mongoose").Types.ObjectId;
-    }, never>>>;
+    }>>;
 }

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

@@ -74,20 +74,20 @@ export declare class CreativeWorkRepo {
     }): Promise<void>;
     getCursor(conditions: FilterQuery<factory.creativeWork.movie.ICreativeWork>, projection: any): import("mongoose").Cursor<Document<unknown, {}, import("@chevre/factory/lib/creativeWork/movie").ICreativeWork & {
         description?: string | undefined;
-    }> & Omit<import("@chevre/factory/lib/creativeWork/movie").ICreativeWork & {
+    }> & import("@chevre/factory/lib/creativeWork/movie").ICreativeWork & {
         description?: string | undefined;
     } & {
         _id: Types.ObjectId;
-    }, never>, import("mongoose").QueryOptions<Document<unknown, {}, import("@chevre/factory/lib/creativeWork/movie").ICreativeWork & {
+    }, import("mongoose").QueryOptions<Document<unknown, {}, import("@chevre/factory/lib/creativeWork/movie").ICreativeWork & {
         description?: string | undefined;
-    }> & Omit<import("@chevre/factory/lib/creativeWork/movie").ICreativeWork & {
+    }> & import("@chevre/factory/lib/creativeWork/movie").ICreativeWork & {
         description?: string | undefined;
     } & {
         _id: Types.ObjectId;
-    }, never>>>;
+    }>>;
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<factory.creativeWork.movie.ICreativeWork>;
         $unset: any;
-    }): Promise<import("mongodb").UpdateResult>;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
 }
 export {};

package/lib/chevre/repo/creativeWork.js

@@ -121,7 +121,7 @@ class CreativeWorkRepo {
         return __awaiter(this, void 0, void 0, function* () {
             let doc;
             if (params.id === '') {
-                const { $unset } = params, createParams = __rest(params, ["$unset"]);
+                const { $unset, id } = params, createParams = __rest(params, ["$unset", "id"]); // omit id(2024-09-12~)
                 doc = yield this.creativeWorkModel.create(createParams);
             }
             else {

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,25 +37,28 @@ 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>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, factory.customer.ICustomer> & Omit<factory.customer.ICustomer & {
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, factory.customer.ICustomer> & factory.customer.ICustomer & {
         _id: import("mongoose").Types.ObjectId;
-    }, never>, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, factory.customer.ICustomer> & Omit<factory.customer.ICustomer & {
+    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, factory.customer.ICustomer> & factory.customer.ICustomer & {
         _id: import("mongoose").Types.ObjectId;
-    }, never>>>;
+    }>>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;
-    }): Promise<import("mongodb").UpdateResult>;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
 }
 export {};

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();
         });
     }