@chevre/domain 24.0.0-alpha.8 → 24.0.0-alpha.81

package/lib/chevre/repo/orderInTransaction.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.OrderInTransactionRepo = void 0;
-const factory = __importStar(require("../factory"));
+const factory_1 = require("../factory");
 const order_1 = require("./mongoose/schemas/order");
 /**
  * 取引中注文リポジトリ
@@ -40,12 +17,12 @@ class OrderInTransactionRepo {
     async findAcceptedOffersByOrderNumber(params) {
         const doc = await this.orderModel.findOne({
             orderNumber: { $eq: params.orderNumber.$eq },
-            typeOf: { $eq: factory.transactionType.PlaceOrder }
+            typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder }
         }, { acceptedOffers: 1 })
             .lean()
             .exec();
         if (doc === null) {
-            throw new factory.errors.NotFound('orderInTransaction');
+            throw new factory_1.factory.errors.NotFound('orderInTransaction');
         }
         return doc.acceptedOffers;
     }
@@ -54,7 +31,7 @@ class OrderInTransactionRepo {
      */
     async placeOrder(order) {
         if (!(order.orderDate instanceof Date)) {
-            throw new factory.errors.Argument('orderDate', 'must be Date');
+            throw new factory_1.factory.errors.Argument('orderDate', 'must be Date');
         }
         // acceptedOffersを上書きしない
         // const { acceptedOffers, ...orderWithoutAcceptedOffers } = order;
@@ -62,7 +39,7 @@ class OrderInTransactionRepo {
         // typeOf:PlaceOrderのドキュメントが存在すれば、typeOf:Orderに変更する
         await this.orderModel.updateOne({
             orderNumber: { $eq: order.orderNumber },
-            typeOf: { $eq: factory.transactionType.PlaceOrder }
+            typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder }
         }, { $set: setFields }, {})
             .exec();
     }
@@ -75,13 +52,13 @@ class OrderInTransactionRepo {
             return;
         }
         const setOnInsert = {
-            typeOf: factory.transactionType.PlaceOrder,
+            typeOf: factory_1.factory.transactionType.PlaceOrder,
             orderDate: new Date(), // orderDate required(2024-12-09~)
             orderNumber: params.orderNumber,
             project: params.project
         };
         return this.orderModel.updateOne({
-            typeOf: { $eq: factory.transactionType.PlaceOrder },
+            typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },
             orderNumber: { $eq: params.orderNumber },
             // プロジェクトでもフィルター(注文番号重複バグがあったため)(2026-02-21~)
             // 万が一異なるプロジェクトで同じ注文番号でオファーを受け入れようとしても、DBにインデックスによってDuplicateKey
@@ -105,7 +82,7 @@ class OrderInTransactionRepo {
         const serialNumberNin = params.acceptedOffers.serialNumber.$nin;
         if (Array.isArray(serialNumberIn) && serialNumberIn.length > 0) {
             return this.orderModel.updateOne({
-                typeOf: { $eq: factory.transactionType.PlaceOrder },
+                typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },
                 orderNumber: { $eq: params.orderNumber }
             }, {
                 $pull: {
@@ -118,7 +95,7 @@ class OrderInTransactionRepo {
         }
         else if (Array.isArray(serialNumberNin) && serialNumberNin.length > 0) {
             return this.orderModel.updateOne({
-                typeOf: { $eq: factory.transactionType.PlaceOrder },
+                typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },
                 orderNumber: { $eq: params.orderNumber }
             }, {
                 $pull: {
@@ -136,14 +113,14 @@ class OrderInTransactionRepo {
     async setCustomer(params) {
         const { customer, orderNumber, project } = params;
         const filter = {
-            typeOf: { $eq: factory.transactionType.PlaceOrder },
+            typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },
             orderNumber: { $eq: orderNumber },
             // プロジェクトでもフィルター(注文番号重複バグがあったため)(2026-02-21~)
             // 万が一異なるプロジェクトで同じ注文番号でオファーを受け入れようとしても、DBにインデックスによってDuplicateKey
             'project.id': { $eq: project.id }
         };
         const setOnInsert = {
-            typeOf: factory.transactionType.PlaceOrder,
+            typeOf: factory_1.factory.transactionType.PlaceOrder,
             orderDate: new Date(), // orderDate required(2024-12-09~)
             orderNumber,
             project
@@ -155,6 +132,10 @@ class OrderInTransactionRepo {
         }, { upsert: true })
             .exec();
     }
+    /**
+     * 注文ドキュメントからcustomer属性を参照する
+     * customer未設定であれば、NotFound
+     */
     async findCustomerByOrderNumber(params) {
         const doc = await this.orderModel.findOne({
             orderNumber: { $eq: params.orderNumber.$eq }
@@ -163,16 +144,16 @@ class OrderInTransactionRepo {
             .lean()
             .exec();
         if (doc === null) {
-            throw new factory.errors.NotFound('orderInTransaction');
+            throw new factory_1.factory.errors.NotFound('orderInTransaction');
         }
         if (typeof doc.customer?.typeOf !== 'string') {
-            throw new factory.errors.NotFound('orderInTransaction.customer');
+            throw new factory_1.factory.errors.NotFound('orderInTransaction.customer');
         }
         return doc.customer;
     }
     async deleteByOrderNumber(params) {
         return this.orderModel.deleteOne({
-            typeOf: { $eq: factory.transactionType.PlaceOrder },
+            typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },
             orderNumber: { $eq: params.orderNumber }
         })
             .exec();

package/lib/chevre/repo/orderNumber.js

@@ -1,34 +1,11 @@
 "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.OrderNumberRepo = void 0;
 const moment_timezone_1 = __importDefault(require("moment-timezone"));
-const factory = __importStar(require("../factory"));
+const factory_1 = require("../factory");
 const transactionNumber_1 = require("../factory/transactionNumber");
 const setting_1 = require("./mongoose/schemas/setting");
 const transactionNumber_2 = require("./mongoose/schemas/transactionNumber");
@@ -94,7 +71,7 @@ class OrderNumberRepo {
         }
         else {
             // discontinue version0(2026-02-13~)
-            throw new factory.errors.NotImplemented('orderNumber with no version discontinued');
+            throw new factory_1.factory.errors.NotImplemented('orderNumber with no version discontinued');
             // orderNumber = OrderNumberRepo.GENERATE_VERSION0(timestamp, incrReply);
             // orderNumber = `${projectPrefix}${orderNumber}`;
             // orderNumber = `${[
@@ -117,7 +94,7 @@ class OrderNumberRepo {
             return transactionFactory.decrypt(originalOrderNumber);
         }
         else {
-            throw new factory.errors.NotImplemented('no version not implemented');
+            throw new factory_1.factory.errors.NotImplemented('no version not implemented');
         }
     }
     /**
@@ -140,13 +117,13 @@ class OrderNumberRepo {
         }
         const { fpeSecret, version, validFrom } = setting.orderNumber;
         if (typeof fpeSecret !== 'string' || fpeSecret === '') {
-            throw new factory.errors.NotFound('setting.orderNumber.secret');
+            throw new factory_1.factory.errors.NotFound('setting.orderNumber.secret');
         }
         if (typeof version !== 'string' || version === '') {
-            throw new factory.errors.NotFound('setting.orderNumber.version');
+            throw new factory_1.factory.errors.NotFound('setting.orderNumber.version');
         }
         if (!(validFrom instanceof Date)) {
-            throw new factory.errors.NotFound('setting.orderNumber.validFrom must be Date');
+            throw new factory_1.factory.errors.NotFound('setting.orderNumber.validFrom must be Date');
         }
         return {
             fpeSecret, version, validFrom

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

@@ -1,5 +1,6 @@
 import type { Connection } from 'mongoose';
-import * as factory from '../factory';
+import { IDocType } from './mongoose/schemas/ownershipInfo';
+import { factory } from '../factory';
 export type IOwnershipInfoWithId = factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood> & {
     id: string;
 };
@@ -70,22 +71,28 @@ export declare class OwnershipInfoRepo {
         };
         identifiers: string[];
         ownedThrough: {
-            $lt: Date;
+            $lte: Date;
         };
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood> & {
-        _id: string;
-    }> & factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood> & {
+    /**
+     * 所有期限切れの所有権を削除する
+     */
+    deleteExpiredOwnershipInfos(params: {
+        ownedThroughLte: Date;
+    }): Promise<void>;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood>, "id"> & {
         _id: string;
     } & Required<{
         _id: string;
-    }>, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood> & {
-        _id: string;
-    }> & factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood> & {
+    }> & {
+        __v: number;
+    }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood>, "id"> & {
         _id: string;
     } & Required<{
         _id: string;
-    }>>>;
+    }> & {
+        __v: number;
+    }) | null>;
     /**
      * 所有者を追加する
      */

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");
 /**
  * 所有権リポジトリ
@@ -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 {};