@chevre/domain 24.0.0-alpha.9 → 24.0.0

package/lib/chevre/repo/ownershipInfo.js

@@ -1,33 +1,10 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OwnershipInfoRepo = void 0;
-const uuid = __importStar(require("uuid"));
+const uuid_1 = require("uuid");
 const ownershipInfo_1 = require("./mongoose/schemas/ownershipInfo");
 const errorHandler_1 = require("../errorHandler");
-const factory = __importStar(require("../factory"));
+const factory_1 = require("../factory");
 const settings_1 = require("../settings");
 /**
  * 所有権リポジトリ
@@ -38,7 +15,7 @@ class OwnershipInfoRepo {
         this.ownershipInfoModel = connection.model(ownershipInfo_1.modelName, (0, ownershipInfo_1.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        const andConditions = [];
+        const andConditions = []; // eslint-disable-line @typescript-eslint/no-explicit-any
         /* istanbul ignore else */
         if (params.project !== undefined) {
             if (params.project.id !== undefined && params.project.id !== null) {
@@ -236,7 +213,7 @@ class OwnershipInfoRepo {
                 // insert時以外は何もしなくてもよい
                 $setOnInsert: {
                     ...ownershipInfo,
-                    _id: uuid.v4() // 新規作成時は所有権ID発行
+                    _id: (0, uuid_1.v4)() // 新規作成時は所有権ID発行
                 }
             }, {
                 new: true,
@@ -253,11 +230,9 @@ class OwnershipInfoRepo {
                 .exec();
         }
         catch (error) {
-            if (await (0, errorHandler_1.isMongoError)(error)) {
+            if (await (0, errorHandler_1.isMongoDuplicateError)(error)) {
                 // すでに所有権が存在する場合ok
-                if (error.code === errorHandler_1.MongoErrorCode.DuplicateKey) {
-                    duplicate = true;
-                }
+                duplicate = true;
             }
             if (!duplicate) {
                 throw error;
@@ -276,7 +251,7 @@ class OwnershipInfoRepo {
                 .exec();
         }
         if (doc === undefined || doc === null) {
-            throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);
+            throw new factory_1.factory.errors.NotFound(this.ownershipInfoModel.modelName);
         }
         return { id: doc.id };
     }
@@ -307,7 +282,7 @@ class OwnershipInfoRepo {
             .lean() // lean(2024-08-15~)
             .exec();
         if (doc === null) {
-            throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);
+            throw new factory_1.factory.errors.NotFound(this.ownershipInfoModel.modelName);
         }
         return doc;
     }
@@ -422,14 +397,24 @@ class OwnershipInfoRepo {
         await this.ownershipInfoModel.deleteMany({
             'project.id': { $eq: params.project.id },
             identifier: { $in: params.identifiers },
-            // 所有期限切れのもの(ownedThroughの存在しないものは削除してはいけない)
-            ownedThrough: { $exists: true, $lt: params.ownedThrough.$lt }
+            // 所有期限切れのもの(ownedThroughは必ず存在する)
+            ownedThrough: { $lte: params.ownedThrough.$lte }
+        })
+            .exec();
+    }
+    /**
+     * 所有期限切れの所有権を削除する
+     */
+    async deleteExpiredOwnershipInfos(params) {
+        await this.ownershipInfoModel.deleteMany({
+            // 所有期限切れのもの(ownedThroughは必ず存在する)
+            ownedThrough: { $lte: params.ownedThroughLte }
         })
             .exec();
     }
     getCursor(conditions, projection) {
         return this.ownershipInfoModel.find(conditions, projection)
-            .sort({ ownedFrom: factory.sortType.Ascending })
+            .sort({ ownedFrom: factory_1.factory.sortType.Ascending })
             .cursor();
     }
     /**
@@ -437,17 +422,10 @@ class OwnershipInfoRepo {
      */
     async addOwnerIfNotExist(params) {
         if (typeof params.ownedBy.id !== 'string' || params.ownedBy.id.length === 0) {
-            throw new factory.errors.ArgumentNull('ownedBy.id');
+            throw new factory_1.factory.errors.ArgumentNull('ownedBy.id');
         }
         let newOwner;
-        if (params.ownedBy.typeOf === factory.organizationType.Organization) {
-            newOwner = {
-                id: params.ownedBy.id,
-                typeOf: params.ownedBy.typeOf
-            };
-        }
-        else if (params.ownedBy.typeOf === factory.personType.Person
-            || params.ownedBy.typeOf === factory.creativeWorkType.WebApplication) {
+        if (params.ownedBy.typeOf === factory_1.factory.personType.Person) {
             newOwner = {
                 id: params.ownedBy.id,
                 typeOf: params.ownedBy.typeOf
@@ -460,7 +438,7 @@ class OwnershipInfoRepo {
             })
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);
+                throw new factory_1.factory.errors.NotFound(this.ownershipInfoModel.modelName);
             }
         }
     }
@@ -469,7 +447,7 @@ class OwnershipInfoRepo {
      */
     async removeOwnerIfExist(params) {
         if (typeof params.ownedBy.id !== 'string' || params.ownedBy.id.length === 0) {
-            throw new factory.errors.ArgumentNull('ownedBy.id');
+            throw new factory_1.factory.errors.ArgumentNull('ownedBy.id');
         }
         const doc = await this.ownershipInfoModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $pull: { ownedBy: { id: params.ownedBy.id } } }, {
             new: true,
@@ -477,7 +455,7 @@ class OwnershipInfoRepo {
         })
             .exec();
         if (doc === null) {
-            throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);
+            throw new factory_1.factory.errors.NotFound(this.ownershipInfoModel.modelName);
         }
     }
     async unsetUnnecessaryFields(params) {

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

@@ -1,6 +1,6 @@
-import * as jwt from 'jsonwebtoken';
+import { JwtPayload } from 'jsonwebtoken';
 import type { RedisClientType } from 'redis';
-import * as factory from '../factory';
+import { factory } from '../factory';
 import { IPassportValidator } from '../factory/transaction';
 export type IVerifiedPassport = factory.waiter.passport.IPassport & {
     /**
@@ -20,7 +20,7 @@ interface IOptions {
     secret: string;
     passportValidator?: IPassportValidator;
 }
-type IStartParams = (factory.transaction.placeOrder.IStartParamsWithoutDetail | factory.transaction.moneyTransfer.IStartParamsWithoutDetail) & {};
+type IStartParams = (factory.transaction.placeOrder.IStartParamsWithoutDetail) & {};
 /**
  * 取引許可証リポジトリ
  */
@@ -28,7 +28,7 @@ export declare class PassportRepo {
     private readonly concurrentLockRepo;
     private readonly options;
     constructor(redisClient: RedisClientType, options: IOptions);
-    static CREATE_VERIFIED_PASSPORT(params: string | jwt.JwtPayload | undefined): IVerifiedPassport;
+    static CREATE_VERIFIED_PASSPORT(params: string | JwtPayload | undefined): IVerifiedPassport;
     static CREATE_REDIS_KEY(params: ILockKey): string;
     lock(params: ILockKey): Promise<void>;
     /**

package/lib/chevre/repo/passport.js

@@ -1,36 +1,13 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PassportRepo = void 0;
 const debug_1 = __importDefault(require("debug"));
-const jwt = __importStar(require("jsonwebtoken"));
+const jsonwebtoken_1 = require("jsonwebtoken");
 const moment_1 = __importDefault(require("moment"));
-const factory = __importStar(require("../factory"));
+const factory_1 = require("../factory");
 const concurrentLock_1 = require("./concurrentLock");
 const debug = (0, debug_1.default)('chevre-domain:repo:passport');
 /**
@@ -47,25 +24,25 @@ class PassportRepo {
     }
     static CREATE_VERIFIED_PASSPORT(params) {
         if (typeof params === 'string' || params === undefined) {
-            throw new factory.errors.Argument('decoded must be an object');
+            throw new factory_1.factory.errors.Argument('decoded must be an object');
         }
         if (typeof params.scope !== 'string' || params.scope === '') {
-            throw new factory.errors.ArgumentNull('scope');
+            throw new factory_1.factory.errors.ArgumentNull('scope');
         }
         if (typeof params.iat !== 'number') {
-            throw new factory.errors.Argument('iat', 'iat must be number');
+            throw new factory_1.factory.errors.Argument('iat', 'iat must be number');
         }
         if (typeof params.exp !== 'number') {
-            throw new factory.errors.Argument('exp', 'exp must be number');
+            throw new factory_1.factory.errors.Argument('exp', 'exp must be number');
         }
         if (typeof params.iss !== 'string' || params.iss === '') {
-            throw new factory.errors.ArgumentNull('iss');
+            throw new factory_1.factory.errors.ArgumentNull('iss');
         }
         if (typeof params.issueUnit?.identifier !== 'string' || params.issueUnit.identifier === '') {
-            throw new factory.errors.Argument('issueUnit.identifier', 'issueUnit.identifier must be string');
+            throw new factory_1.factory.errors.Argument('issueUnit.identifier', 'issueUnit.identifier must be string');
         }
         if (typeof params.issueUnit.numberOfRequests !== 'number') {
-            throw new factory.errors.Argument('issueUnit.numberOfRequests', 'issueUnit.numberOfRequests must be number');
+            throw new factory_1.factory.errors.Argument('issueUnit.numberOfRequests', 'issueUnit.numberOfRequests must be number');
         }
         const identifier = `${params.issueUnit.identifier}:${params.issueUnit.numberOfRequests}`;
         return {
@@ -93,15 +70,15 @@ class PassportRepo {
         // reimplement using concurrentLockRepo(2025-05-27~)
         try {
             await this.concurrentLockRepo.lock({
-                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
                 about: { identifier: key, typeOf: 'Thing' },
                 expires,
                 audience: { identifier: '1', typeOf: 'Audience' }
             });
             debug('locked,', params.issueUnit.identifier, passportExpires);
         }
-        catch (error) {
-            throw new factory.errors.AlreadyInUse('passport', [], 'passport already in use');
+        catch (_error) {
+            throw new factory_1.factory.errors.AlreadyInUse('passport', [], 'passport already in use');
         }
         // const ttl = (passportExpires.isAfter(now))
         //     ? moment.unix(params.exp)
@@ -132,20 +109,20 @@ class PassportRepo {
                 });
             }
             catch (error) {
-                let message = `Invalid token: ${error.message}`;
-                if (error instanceof jwt.JsonWebTokenError) {
+                let message = `Invalid token: ${(error instanceof Error) ? error.message : String(error)}`;
+                if (error instanceof jsonwebtoken_1.JsonWebTokenError) {
                     // remove -> 'jwt issuer invalid. expected: [OPTIONS ISSUER]'
                     const indexOfExpected = message.indexOf('expected:');
                     if (indexOfExpected >= 0) {
                         message = message.substring(0, indexOfExpected);
                     }
                 }
-                throw new factory.errors.Argument('passport.token', message);
+                throw new factory_1.factory.errors.Argument('passport.token', message);
             }
             // 許可証バリデーション
             if (typeof this.options.passportValidator === 'function') {
                 if (!this.options.passportValidator({ passport })) {
-                    throw new factory.errors.Argument('passport.token', 'passportValidator requirement not satisfied');
+                    throw new factory_1.factory.errors.Argument('passport.token', 'passportValidator requirement not satisfied');
                 }
             }
             // カスタマータイプ決定(2023-11-20~)
@@ -163,7 +140,7 @@ class PassportRepo {
      */
     async verify(params) {
         return new Promise((resolve, reject) => {
-            jwt.verify(params.token, this.options.secret, {
+            (0, jsonwebtoken_1.verify)(params.token, this.options.secret, {
                 algorithms: ['HS256'],
                 issuer: this.options.issuers // add verify issuer(2024-07-08~)
             }, (err, decoded) => {

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

@@ -1,5 +1,5 @@
 import type { Connection, FilterQuery } from 'mongoose';
-import * as factory from '../factory';
+import { factory } from '../factory';
 import { IModel } from './mongoose/schemas/paymentService';
 type IUnsetKey = keyof Pick<factory.service.paymentService.IService, 'additionalProperty' | 'availableChannel' | 'serviceOutput' | 'serviceType'>;
 type IKeyOfProjection4paymentService = keyof factory.service.paymentService.IService;
@@ -14,7 +14,7 @@ export declare class PaymentServiceRepo {
     private readonly paymentServiceModel;
     private readonly paymentServiceChannelModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: ISearchConditions4paymentService): FilterQuery<import("@chevre/factory/lib/service/paymentService").IService>[];
+    static CREATE_MONGO_CONDITIONS(params: ISearchConditions4paymentService): FilterQuery<import("@chevre/factory/lib/chevre/service/paymentService").IService>[];
     /**
      * 決済サービスを保管する
      */
@@ -26,9 +26,7 @@ export declare class PaymentServiceRepo {
         $set: factory.service.paymentService.IService & {
             provider?: never;
         };
-        $unset: {
-            [key in IUnsetKey]?: 1;
-        };
+        $unset: Partial<Record<IUnsetKey, 1>>;
         /**
          * 指定プロジェクトの指定プロダクトタイプが存在しなければ作成する
          */
@@ -53,7 +51,7 @@ export declare class PaymentServiceRepo {
          * payment service ID
          */
         id: string;
-    }): Promise<Pick<factory.service.paymentService.IAvailableChannel, 'totalPaymentDue' | 'typeOf' | 'id'> & Pick<factory.serviceChannel.IServiceChannel, 'serviceUrl'> & {
+    }): Promise<Pick<factory.service.paymentService.IAvailableChannelCreditCard, 'totalPaymentDue' | 'typeOf' | 'id'> & Pick<factory.serviceChannel.IServiceChannel, 'serviceUrl'> & {
         id: string;
         credentials: factory.serviceChannel.ICredentialsCreditCard;
     }>;
@@ -65,7 +63,7 @@ export declare class PaymentServiceRepo {
          * payment service ID
          */
         id: string;
-    }): Promise<Pick<factory.service.paymentService.IAvailableChannel, 'totalPaymentDue' | 'typeOf' | 'id'> & Pick<factory.serviceChannel.IServiceChannel, 'serviceUrl'> & {
+    }): Promise<Pick<factory.service.paymentService.IAvailableChannelMovieTicket, 'totalPaymentDue' | 'typeOf' | 'id'> & Pick<factory.serviceChannel.IServiceChannel, 'serviceUrl'> & {
         id: string;
         credentials: factory.serviceChannel.ICredentialsMovieTicket;
     }>;
@@ -73,19 +71,6 @@ export declare class PaymentServiceRepo {
         filter: any;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, Omit<import("@chevre/factory/lib/service/paymentService").IService, "id"> & {
-        provider?: factory.service.paymentService.IProvider[];
-    }> & Omit<import("@chevre/factory/lib/service/paymentService").IService, "id"> & {
-        provider?: factory.service.paymentService.IProvider[];
-    } & {
-        _id: import("mongoose").Types.ObjectId;
-    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, Omit<import("@chevre/factory/lib/service/paymentService").IService, "id"> & {
-        provider?: factory.service.paymentService.IProvider[];
-    }> & Omit<import("@chevre/factory/lib/service/paymentService").IService, "id"> & {
-        provider?: factory.service.paymentService.IProvider[];
-    } & {
-        _id: import("mongoose").Types.ObjectId;
-    }>>;
     getModel(): IModel;
 }
 export {};

package/lib/chevre/repo/paymentService.js

@@ -1,30 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PaymentServiceRepo = void 0;
-const factory = __importStar(require("../factory"));
+const factory_1 = require("../factory");
 const settings_1 = require("../settings");
 const paymentService_1 = require("./mongoose/schemas/paymentService");
 const paymentServiceChannel_1 = require("./mongoose/schemas/paymentServiceChannel");
@@ -186,10 +163,10 @@ class PaymentServiceRepo {
         let savedId;
         if (typeof params.id === 'string') {
             // 上書き禁止属性を除外
-            const { id, productID, project, typeOf, provider, serviceType, ...setFields } = params.$set;
+            const { id, productID, project, typeOf, provider, serviceType, ...setFields } = params.$set; // eslint-disable-line @typescript-eslint/no-unused-vars
             switch (typeOf) {
-                case factory.service.paymentService.PaymentServiceType.CreditCard:
-                case factory.service.paymentService.PaymentServiceType.MovieTicket:
+                case factory_1.factory.service.paymentService.PaymentServiceType.CreditCard:
+                case factory_1.factory.service.paymentService.PaymentServiceType.MovieTicket:
                     doc = await this.paymentServiceModel.findOneAndUpdate({
                         _id: { $eq: params.id },
                         typeOf: { $eq: typeOf }
@@ -200,16 +177,16 @@ class PaymentServiceRepo {
                         .lean()
                         .exec();
                     if (doc === null) {
-                        throw new factory.errors.NotFound(this.paymentServiceModel.modelName);
+                        throw new factory_1.factory.errors.NotFound(this.paymentServiceModel.modelName);
                     }
                     break;
                 default:
-                    throw new factory.errors.NotImplemented(`${typeOf} not implemented`);
+                    throw new factory_1.factory.errors.NotImplemented(`${typeOf} not implemented`);
             }
             savedId = params.id;
         }
         else {
-            const { id, provider, ...createParams } = params.$set;
+            const { id, provider, ...createParams } = params.$set; // eslint-disable-line @typescript-eslint/no-unused-vars
             if (params.createIfNotExist === true) {
                 doc = await this.paymentServiceModel.findOneAndUpdate({
                     'project.id': { $eq: createParams.project.id },
@@ -218,7 +195,7 @@ class PaymentServiceRepo {
                     .lean()
                     .exec();
                 if (doc === null) {
-                    throw new factory.errors.NotFound(this.paymentServiceModel.modelName);
+                    throw new factory_1.factory.errors.NotFound(this.paymentServiceModel.modelName);
                 }
                 savedId = doc.id;
             }
@@ -226,7 +203,7 @@ class PaymentServiceRepo {
                 const result = await this.paymentServiceModel.insertMany(createParams, { rawResult: true });
                 const insertedId = result.insertedIds?.[0]?.toHexString();
                 if (typeof insertedId !== 'string') {
-                    throw new factory.errors.Internal(`paymentService not saved unexpectedly. result:${JSON.stringify(result)}`);
+                    throw new factory_1.factory.errors.Internal(`paymentService not saved unexpectedly. result:${JSON.stringify(result)}`);
                 }
                 savedId = insertedId;
             }
@@ -303,26 +280,26 @@ class PaymentServiceRepo {
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
-            typeOf: { $eq: factory.service.paymentService.PaymentServiceType.CreditCard },
+            typeOf: { $eq: factory_1.factory.service.paymentService.PaymentServiceType.CreditCard },
             id: { $eq: params.id }
         }, ['availableChannel']
         // []
         )).shift();
         if (paymentService === undefined) {
-            throw new factory.errors.NotFound(factory.service.paymentService.PaymentServiceType.CreditCard);
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.service.paymentService.PaymentServiceType.CreditCard);
         }
         const availableChannel = paymentService.availableChannel;
         if (availableChannel === undefined) {
-            throw new factory.errors.NotFound('paymentService.availableChannel');
+            throw new factory_1.factory.errors.NotFound('paymentService.availableChannel');
         }
         if (typeof availableChannel.id !== 'string' || availableChannel.id === '') {
-            throw new factory.errors.NotFound('paymentService.availableChannel.id');
+            throw new factory_1.factory.errors.NotFound('paymentService.availableChannel.id');
         }
         const serviceChannel = await this.paymentServiceChannelModel.findOne({
             'project.id': { $eq: params.project.id },
             _id: { $eq: availableChannel.id },
             // serviceUrl: { $eq: availableChannel.serviceUrl },
-            'providesService.typeOf': { $eq: factory.service.paymentService.PaymentServiceType.CreditCard }
+            'providesService.typeOf': { $eq: factory_1.factory.service.paymentService.PaymentServiceType.CreditCard }
         }, {
             credentials: 1,
             _id: 0,
@@ -332,7 +309,7 @@ class PaymentServiceRepo {
             .lean()
             .exec();
         if (serviceChannel === null) {
-            throw new factory.errors.NotFound('ServiceChannel');
+            throw new factory_1.factory.errors.NotFound('ServiceChannel');
         }
         return {
             ...availableChannel,
@@ -346,26 +323,26 @@ class PaymentServiceRepo {
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
-            typeOf: { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket },
+            typeOf: { $eq: factory_1.factory.service.paymentService.PaymentServiceType.MovieTicket },
             id: { $eq: params.id }
         }, ['availableChannel']
         // []
         )).shift();
         if (paymentService === undefined) {
-            throw new factory.errors.NotFound(factory.service.paymentService.PaymentServiceType.MovieTicket);
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.service.paymentService.PaymentServiceType.MovieTicket);
         }
         const availableChannel = paymentService.availableChannel;
         if (availableChannel === undefined) {
-            throw new factory.errors.NotFound('paymentService.availableChannel');
+            throw new factory_1.factory.errors.NotFound('paymentService.availableChannel');
         }
         if (typeof availableChannel.id !== 'string' || availableChannel.id === '') {
-            throw new factory.errors.NotFound('paymentService.availableChannel.id');
+            throw new factory_1.factory.errors.NotFound('paymentService.availableChannel.id');
         }
         const serviceChannel = await this.paymentServiceChannelModel.findOne({
             'project.id': { $eq: '*' },
             _id: { $eq: availableChannel.id },
             // serviceUrl: { $eq: availableChannel.serviceUrl },
-            'providesService.typeOf': { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket }
+            'providesService.typeOf': { $eq: factory_1.factory.service.paymentService.PaymentServiceType.MovieTicket }
         }, {
             credentials: 1,
             _id: 0,
@@ -375,7 +352,7 @@ class PaymentServiceRepo {
             .lean()
             .exec();
         if (serviceChannel === null) {
-            throw new factory.errors.NotFound('ServiceChannel');
+            throw new factory_1.factory.errors.NotFound('ServiceChannel');
         }
         return {
             ...availableChannel,
@@ -443,11 +420,11 @@ class PaymentServiceRepo {
         return this.paymentServiceModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
             .exec();
     }
-    getCursor(conditions, projection) {
-        return this.paymentServiceModel.find(conditions, projection)
-            .sort({ productID: factory.sortType.Ascending })
-            .cursor();
-    }
+    // public getCursor(conditions: any, projection: any) {
+    //     return this.paymentServiceModel.find(conditions, projection)
+    //         .sort({ productID: factory.sortType.Ascending })
+    //         .cursor();
+    // }
     getModel() {
         return this.paymentServiceModel;
     }

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

@@ -1,12 +1,10 @@
 import type { Connection, FilterQuery } from 'mongoose';
-import * as factory from '../factory';
+import { factory } from '../factory';
 export type ISavingChannel = Pick<factory.serviceChannel.IServiceChannel, 'credentials' | 'project' | 'providesService' | 'serviceUrl' | 'typeOf'> & {
     id?: never;
 };
 interface IUnset {
-    $unset?: {
-        [key: string]: 1;
-    };
+    $unset?: Record<string, 1>;
 }
 type IServiceChannelWithId = factory.serviceChannel.IServiceChannel & {
     id: string;

package/lib/chevre/repo/paymentServiceChannel.js

@@ -1,30 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PaymentServiceChannelRepo = void 0;
-const factory = __importStar(require("../factory"));
+const factory_1 = require("../factory");
 const settings_1 = require("../settings");
 const paymentServiceChannel_1 = require("./mongoose/schemas/paymentServiceChannel");
 const AVAILABLE_PROJECT_FIELDS = [
@@ -73,9 +50,9 @@ class PaymentServiceChannelRepo {
         const savingId = params.id;
         if (typeof savingId === 'string') {
             if (savingId === '') {
-                throw new factory.errors.ArgumentNull('id');
+                throw new factory_1.factory.errors.ArgumentNull('id');
             }
-            const { id, serviceUrl, providesService, project, typeOf, $unset, ...updateFields } = params.attributes;
+            const { id, serviceUrl, providesService, project, typeOf, $unset, ...updateFields } = params.attributes; // eslint-disable-line @typescript-eslint/no-unused-vars
             const filter = {
                 _id: { $eq: savingId },
                 'project.id': { $eq: project.id }
@@ -93,16 +70,16 @@ class PaymentServiceChannelRepo {
                 .lean()
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.paymentServiceChannelModel.modelName);
+                throw new factory_1.factory.errors.NotFound(this.paymentServiceChannelModel.modelName);
             }
             savedId = savingId;
         }
         else {
-            const { $unset, id, ...createParams } = params.attributes;
+            const { $unset, id, ...createParams } = params.attributes; // eslint-disable-line @typescript-eslint/no-unused-vars
             const result = await this.paymentServiceChannelModel.insertMany(createParams, { rawResult: true });
             const insertedId = result.insertedIds?.[0]?.toHexString();
             if (typeof insertedId !== 'string') {
-                throw new factory.errors.Internal(`not saved unexpectedly. result:${JSON.stringify(result)}`);
+                throw new factory_1.factory.errors.Internal(`not saved unexpectedly. result:${JSON.stringify(result)}`);
             }
             savedId = insertedId;
         }

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

@@ -1,5 +1,5 @@
 import { Connection, FilterQuery } from 'mongoose';
-import * as factory from '../factory';
+import { factory } from '../factory';
 type IAvailablePaymentServiceType = factory.service.paymentService.PaymentServiceType.CreditCard | factory.service.paymentService.PaymentServiceType.MovieTicket;
 export type IPublicPaymentServiceByProvider = Pick<factory.service.paymentService.IService, 'name' | 'description' | 'typeOf' | 'id' | 'productID' | 'serviceType' | 'serviceOutput' | 'additionalProperty'> & {
     provider?: {