@chevre/domain 22.2.0-alpha.21 → 22.2.0-alpha.23

package/lib/chevre/repo/role.js

@@ -9,13 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RoleRepo = exports.RoleType = void 0;
-const role_1 = require("./mongoose/schemas/role");
+exports.RoleRepo = void 0;
 const settings_1 = require("../settings");
-var RoleType;
-(function (RoleType) {
-    RoleType["OrganizationRole"] = "OrganizationRole";
-})(RoleType = exports.RoleType || (exports.RoleType = {}));
+const role_1 = require("./mongoose/schemas/role");
+const AVAILABLE_PROJECT_FIELDS = [
+    'typeOf',
+    'permissions',
+    'roleName'
+];
 /**
  * IAMロールリポジトリ
  */
@@ -39,10 +40,19 @@ class RoleRepo {
         }
         return andConditions;
     }
-    search(params) {
+    projectFields(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = RoleRepo.CREATE_MONGO_CONDITIONS(params);
-            const query = this.roleModel.find((conditions.length > 0) ? { $and: conditions } : {}, {});
+            const 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 }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            const query = this.roleModel.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)
@@ -56,8 +66,8 @@ class RoleRepo {
             // 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() // 2024-08-23~
+                .exec();
         });
     }
     aggregatePermissions(params) {

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

@@ -22,7 +22,7 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import { AnyExpression, Connection, FilterQuery, QueryOptions } from 'mongoose';
+import { AnyExpression, Connection, FilterQuery, QueryOptions, Types } from 'mongoose';
 import * as factory from '../factory';
 export type ISellerWithId = Pick<factory.seller.ISeller, 'additionalProperty' | 'branchCode' | 'hasMerchantReturnPolicy' | 'id' | 'makesOffer' | 'name' | 'project' | 'telephone' | 'typeOf' | 'url'> & {
     id: string;
@@ -97,7 +97,59 @@ export declare class SellerRepo {
         id: string;
         makesOffer: factory.seller.IMakesOffer;
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<factory.seller.ISeller>, projection: any): import("mongoose").Cursor<any, QueryOptions<any>>;
+    getCursor(conditions: FilterQuery<factory.seller.ISeller>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, {
+        url?: string | undefined;
+        project: Pick<factory.project.IProject, "id" | "typeOf">;
+        name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
+        typeOf: factory.organizationType.Corporation;
+        additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
+        location?: import("@chevre/factory/lib/place").IPlace | undefined;
+        telephone?: string | undefined;
+        hasMerchantReturnPolicy?: factory.seller.IHasMerchantReturnPolicy | undefined;
+        branchCode: string;
+        makesOffer?: factory.seller.IMakesOffer[] | undefined;
+        paymentAccepted?: factory.seller.IPaymentAccepted[] | undefined;
+    }> & Omit<{
+        url?: string | undefined;
+        project: Pick<factory.project.IProject, "id" | "typeOf">;
+        name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
+        typeOf: factory.organizationType.Corporation;
+        additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
+        location?: import("@chevre/factory/lib/place").IPlace | undefined;
+        telephone?: string | undefined;
+        hasMerchantReturnPolicy?: factory.seller.IHasMerchantReturnPolicy | undefined;
+        branchCode: string;
+        makesOffer?: factory.seller.IMakesOffer[] | undefined;
+        paymentAccepted?: factory.seller.IPaymentAccepted[] | undefined;
+    } & {
+        _id: Types.ObjectId;
+    }, never>, QueryOptions<import("mongoose").Document<unknown, {}, {
+        url?: string | undefined;
+        project: Pick<factory.project.IProject, "id" | "typeOf">;
+        name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
+        typeOf: factory.organizationType.Corporation;
+        additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
+        location?: import("@chevre/factory/lib/place").IPlace | undefined;
+        telephone?: string | undefined;
+        hasMerchantReturnPolicy?: factory.seller.IHasMerchantReturnPolicy | undefined;
+        branchCode: string;
+        makesOffer?: factory.seller.IMakesOffer[] | undefined;
+        paymentAccepted?: factory.seller.IPaymentAccepted[] | undefined;
+    }> & Omit<{
+        url?: string | undefined;
+        project: Pick<factory.project.IProject, "id" | "typeOf">;
+        name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
+        typeOf: factory.organizationType.Corporation;
+        additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
+        location?: import("@chevre/factory/lib/place").IPlace | undefined;
+        telephone?: string | undefined;
+        hasMerchantReturnPolicy?: factory.seller.IHasMerchantReturnPolicy | undefined;
+        branchCode: string;
+        makesOffer?: factory.seller.IMakesOffer[] | undefined;
+        paymentAccepted?: factory.seller.IPaymentAccepted[] | undefined;
+    } & {
+        _id: Types.ObjectId;
+    }, never>>>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;

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

@@ -22,8 +22,9 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import type { Connection, Model, UpdateWriteOpResult } from 'mongoose';
+import type { Connection, UpdateWriteOpResult } from 'mongoose';
 import * as factory from '../factory';
+import { IModel } from './mongoose/schemas/task';
 interface IAggregationByStatus {
     taskCount: number;
     avgLatency: number;
@@ -55,7 +56,7 @@ type IProjection = {
  * タスクリポジトリ
  */
 export declare class TaskRepo {
-    readonly taskModel: typeof Model;
+    readonly taskModel: IModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.task.ISearchConditions): any[];
     saveOne(savingTask: factory.task.IAttributes<factory.taskName>, options: IOptionOnCreate): Promise<{
@@ -191,7 +192,67 @@ export declare class TaskRepo {
             $nin?: factory.taskName[];
         };
     }): Promise<number>;
-    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, {}, {
+        project: Pick<factory.project.IProject, "id" | "typeOf">;
+        identifier?: string | undefined;
+        name: factory.taskName;
+        expires?: Date | undefined;
+        data: any;
+        status: factory.taskStatus;
+        runsAt: Date;
+        remainingNumberOfTries: number;
+        lastTriedAt?: Date | undefined;
+        numberOfTried: number;
+        executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
+        executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
+        dateAborted?: Date | undefined;
+    }> & Omit<{
+        project: Pick<factory.project.IProject, "id" | "typeOf">;
+        identifier?: string | undefined;
+        name: factory.taskName;
+        expires?: Date | undefined;
+        data: any;
+        status: factory.taskStatus;
+        runsAt: Date;
+        remainingNumberOfTries: number;
+        lastTriedAt?: Date | undefined;
+        numberOfTried: number;
+        executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
+        executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
+        dateAborted?: Date | undefined;
+    } & {
+        _id: import("mongoose").Types.ObjectId;
+    }, never>, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, {
+        project: Pick<factory.project.IProject, "id" | "typeOf">;
+        identifier?: string | undefined;
+        name: factory.taskName;
+        expires?: Date | undefined;
+        data: any;
+        status: factory.taskStatus;
+        runsAt: Date;
+        remainingNumberOfTries: number;
+        lastTriedAt?: Date | undefined;
+        numberOfTried: number;
+        executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
+        executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
+        dateAborted?: Date | undefined;
+    }> & Omit<{
+        project: Pick<factory.project.IProject, "id" | "typeOf">;
+        identifier?: string | undefined;
+        name: factory.taskName;
+        expires?: Date | undefined;
+        data: any;
+        status: factory.taskStatus;
+        runsAt: Date;
+        remainingNumberOfTries: number;
+        lastTriedAt?: Date | undefined;
+        numberOfTried: number;
+        executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
+        executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
+        dateAborted?: Date | undefined;
+    } & {
+        _id: import("mongoose").Types.ObjectId;
+    }, never>>>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;

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

@@ -1,8 +1,9 @@
-import type { Connection, Model } from 'mongoose';
+import type { Connection } from 'mongoose';
+import { IModel } from './mongoose/schemas/telemetry';
 /**
  * 測定リポジトリ
  */
 export declare class TelemetryRepo {
-    readonly telemetryModel: typeof Model;
+    readonly telemetryModel: IModel;
     constructor(connection: Connection);
 }

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

@@ -1,23 +1,7 @@
 import type { Connection, FilterQuery } 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;
-}
+import { ITicket, ITicketIssuedBy } from './mongoose/schemas/ticket';
+export { ITicket };
 type IIssueParams = Pick<ITicket, 'ticketToken'> & {
     project: {
         id: string;
@@ -56,4 +40,3 @@ export declare class TicketRepo {
     issueByTicketToken(params: IIssueParams): Promise<Pick<ITicket, 'id'>>;
     projectFields(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<ITicket[]>;
 }
-export {};

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

@@ -52,7 +52,7 @@ export type IStartedTransaction = Pick<factory.transaction.ITransaction<factory.
 export declare class TransactionRepo {
     private readonly transactionModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.transaction.ISearchConditions<factory.transactionType>): FilterQuery<import("@chevre/factory/lib/assetTransaction/moneyTransfer").ITransaction | import("@chevre/factory/lib/assetTransaction/reserve").ITransaction | import("@chevre/factory/lib/assetTransaction/cancelReservation").ITransaction | import("@chevre/factory/lib/assetTransaction/pay").ITransaction | import("@chevre/factory/lib/assetTransaction/refund").ITransaction | import("@chevre/factory/lib/assetTransaction/registerService").ITransaction>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.transaction.ISearchConditions<factory.transactionType>): FilterQuery<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>[];
     /**
      * 取引を開始する
      */
@@ -60,14 +60,14 @@ export declare class TransactionRepo {
     /**
      * 特定取引検索
      */
-    findById<T extends factory.transactionType>(params: {
+    projectFieldsById<T extends factory.transactionType>(params: {
         typeOf: T;
         id: string;
     }, inclusion: IKeyOfProjection<T>[]): Promise<factory.transaction.ITransaction<T>>;
     /**
      * 進行中の取引を取得する
      */
-    findInProgressById<T extends factory.transactionType>(params: {
+    projectFieldsInProgressById<T extends factory.transactionType>(params: {
         typeOf: T;
         id: string;
     }, inclusion: IKeyOfProjection<T>[]): Promise<ITransactionInProgress<T>>;
@@ -158,7 +158,7 @@ export declare class TransactionRepo {
         status: {
             $in: factory.transactionStatusType[];
         };
-    }): Promise<Pick<import("@chevre/factory/lib/transaction/moneyTransfer").ITransaction | import("@chevre/factory/lib/transaction/placeOrder").ITransaction | import("@chevre/factory/lib/transaction/returnOrder").ITransaction, "typeOf" | "id" | "status">[]>;
+    }): Promise<Pick<import("@chevre/factory/lib/transaction/moneyTransfer").ITransaction | import("@chevre/factory/lib/transaction/placeOrder").ITransaction | import("@chevre/factory/lib/transaction/returnOrder").ITransaction, "id" | "typeOf" | "status">[]>;
     /**
      * set task status exported by transaction id
      * IDでタスクをエクスポート済に変更する
@@ -185,7 +185,7 @@ export declare class TransactionRepo {
     /**
      * 取引を検索する
      */
-    search<T extends factory.transactionType, F extends IKeyOfProjection<T>>(params: factory.transaction.ISearchConditions<T> & {
+    projectFields<T extends factory.transactionType, F extends IKeyOfProjection<T>>(params: factory.transaction.ISearchConditions<T> & {
         inclusion: F[];
     }): Promise<(Pick<factory.transaction.ITransaction<T>, F> & {
         id: string;
@@ -201,14 +201,6 @@ export declare class TransactionRepo {
             };
         };
     }): Promise<void>;
-    findByIdAndUpdate4migrate(params: {
-        id: string;
-        update: {
-            $set?: {
-                'object.paymentMethods'?: factory.transaction.placeOrder.IPaymentMethodByPaymentUrl;
-            };
-        };
-    }): Promise<void>;
     saveOrderNumberIfNotExist(params: {
         id: string;
         orderNumber: string;
@@ -237,7 +229,31 @@ export declare class TransactionRepo {
             $lt: Date;
         };
     }): Promise<import("mongodb").DeleteResult>;
-    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, {}, import("@chevre/factory/lib/transaction/moneyTransfer").ITransaction | import("@chevre/factory/lib/transaction/placeOrder").ITransaction | import("@chevre/factory/lib/transaction/returnOrder").ITransaction> & Omit<(import("@chevre/factory/lib/transaction/moneyTransfer").IAttributes & {
+        id: string;
+    } & {
+        _id: import("mongoose").Types.ObjectId;
+    }) | (import("@chevre/factory/lib/transaction/placeOrder").IAttributes & {
+        id: string;
+    } & {
+        _id: import("mongoose").Types.ObjectId;
+    }) | (import("@chevre/factory/lib/transaction/returnOrder").IAttributes & {
+        id: string;
+    } & {
+        _id: import("mongoose").Types.ObjectId;
+    }), never>, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, import("@chevre/factory/lib/transaction/moneyTransfer").ITransaction | import("@chevre/factory/lib/transaction/placeOrder").ITransaction | import("@chevre/factory/lib/transaction/returnOrder").ITransaction> & Omit<(import("@chevre/factory/lib/transaction/moneyTransfer").IAttributes & {
+        id: string;
+    } & {
+        _id: import("mongoose").Types.ObjectId;
+    }) | (import("@chevre/factory/lib/transaction/placeOrder").IAttributes & {
+        id: string;
+    } & {
+        _id: import("mongoose").Types.ObjectId;
+    }) | (import("@chevre/factory/lib/transaction/returnOrder").IAttributes & {
+        id: string;
+    } & {
+        _id: import("mongoose").Types.ObjectId;
+    }), never>>>;
     aggregatePlaceOrder(params: {
         project?: {
             id?: {