@chevre/domain 24.0.0-alpha.5 → 24.0.0-alpha.52

package/lib/chevre/repo/offerCatalog.js

@@ -153,12 +153,13 @@ class OfferCatalogRepo {
         if (typeof params.id !== 'string' || params.id === '') {
             const { default: uniqid } = await Promise.resolve().then(() => __importStar(require('uniqid')));
             const newId = uniqid();
-            const { id, $unset, ...creatingDoc } = params;
+            const { id, $unset, ...creatingDoc } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
             doc = await this.offerCatalogModel.create({ ...creatingDoc, _id: newId });
             savedId = newId;
         }
         else {
-            const { id, identifier, itemOffered, project, typeOf, $unset, ...updateFields } = params; // 上書き禁止属性を除外
+            // 上書き禁止属性を除外
+            const { id, identifier, itemOffered, project, typeOf, $unset, ...updateFields } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
             doc = await this.offerCatalogModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
                 $set: updateFields,
                 ...(params.$unset !== undefined) ? { $unset: params.$unset } : undefined
@@ -177,7 +178,7 @@ class OfferCatalogRepo {
     async saveByIdentifier(params) {
         const { default: uniqid } = await Promise.resolve().then(() => __importStar(require('uniqid')));
         const newId = uniqid();
-        const { id, identifier, itemOffered, project, typeOf, ...updateFields } = params;
+        const { id, identifier, itemOffered, project, typeOf, ...updateFields } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
         const doc = await this.offerCatalogModel.findOneAndUpdate({
             identifier: { $eq: params.identifier },
             'project.id': { $eq: params.project.id }
@@ -203,7 +204,7 @@ class OfferCatalogRepo {
         const queryFilters = [];
         if (Array.isArray(params)) {
             params.forEach(({ $set, $unset }) => {
-                const { id, identifier, project, typeOf, ...setFields } = $set;
+                const { id, identifier, project, typeOf, ...setFields } = $set; // eslint-disable-line @typescript-eslint/no-unused-vars
                 if (typeof identifier !== 'string' || identifier.length === 0) {
                     throw new factory.errors.ArgumentNull('identifier');
                 }
@@ -270,6 +271,7 @@ class OfferCatalogRepo {
                 .exec();
             return { bulkWriteResult, modifiedCatalogs };
         }
+        return {};
     }
     /**
      * 同期日時を更新する

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

@@ -42,11 +42,11 @@ export declare class OfferCatalogItemRepo {
          */
         productType: factory.product.ProductType;
     }): Promise<{
-        bulkWriteResult: BulkWriteResult;
-        modifiedCatalogs: {
+        bulkWriteResult?: BulkWriteResult;
+        modifiedCatalogs?: {
             id: string;
         }[];
-    } | void>;
+    }>;
     /**
      * 同期日時を更新する
      */

package/lib/chevre/repo/offerCatalogItem.js

@@ -126,11 +126,11 @@ class OfferCatalogItemRepo {
     async save(params) {
         let doc;
         if (typeof params.id !== 'string' || params.id.length === 0) {
-            const { id, $unset, ...creatingDoc } = params;
+            const { id, $unset, ...creatingDoc } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
             doc = await this.offerCatalogItemModel.create(creatingDoc);
         }
         else {
-            const { id, identifier, project, typeOf, $unset, ...updateFields } = params;
+            const { id, identifier, project, typeOf, $unset, ...updateFields } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
             doc = await this.offerCatalogItemModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
                 $set: updateFields,
                 ...(params.$unset !== undefined) ? { $unset: params.$unset } : undefined
@@ -146,7 +146,7 @@ class OfferCatalogItemRepo {
      * プロジェクトとコードから冪等保管
      */
     async saveByIdentifier(params) {
-        const { id, identifier, project, typeOf, ...updateFields } = params;
+        const { id, identifier, project, typeOf, ...updateFields } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
         const doc = await this.offerCatalogItemModel.findOneAndUpdate({
             identifier: { $eq: params.identifier },
             'project.id': { $eq: params.project.id }
@@ -166,7 +166,7 @@ class OfferCatalogItemRepo {
         const queryFilters = [];
         if (Array.isArray(params)) {
             params.forEach(({ $set, $unset }) => {
-                const { id, identifier, project, typeOf, ...setFields } = $set;
+                const { id, identifier, project, typeOf, ...setFields } = $set; // eslint-disable-line @typescript-eslint/no-unused-vars
                 if (typeof identifier !== 'string' || identifier.length === 0) {
                     throw new factory.errors.ArgumentNull('identifier');
                 }
@@ -223,6 +223,7 @@ class OfferCatalogItemRepo {
                 .exec();
             return { bulkWriteResult, modifiedCatalogs };
         }
+        return {};
     }
     /**
      * 同期日時を更新する

package/lib/chevre/repo/offerItemCondition.js

@@ -103,12 +103,12 @@ class OfferItemConditionRepo {
         let savedId;
         let doc;
         if (typeof params.id !== 'string' || params.id === '') {
-            const { id, ...creatingParams } = params; // omit id(2024-09-12~)
+            const { id, ...creatingParams } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
             doc = await this.offerItemConditionModel.create(creatingParams);
             savedId = doc.id;
         }
         else {
-            const { id, identifier, project, typeOf, ...updateFields } = params;
+            const { id, identifier, project, typeOf, ...updateFields } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
             doc = await this.offerItemConditionModel.findOneAndUpdate({ _id: { $eq: id } }, updateFields, { upsert: false, new: true, projection: { _id: 1 } })
                 .exec();
             savedId = id;

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

@@ -1,5 +1,6 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
+import { IDocType } from './mongoose/schemas/order';
 type IOrderWithoutAcceptedOffers = factory.order.IOrder;
 type IKeyOfProjection = Extract<keyof IOrderWithoutAcceptedOffers, 'broker' | 'confirmationNumber' | 'customer' | 'dateReturned' | 'identifier' | 'name' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'previousOrderStatus' | 'price' | 'priceCurrency' | 'project' | 'returner' | 'seller' | 'typeOf' | 'url'> | 'paymentMethods.accountId' | 'paymentMethods.name' | 'paymentMethods.paymentMethod' | 'paymentMethods.paymentMethodId' | 'paymentMethods.totalPaymentDue' | 'paymentMethods.additionalProperty' | 'paymentMethods.issuedThrough' | 'customer.id' | 'customer.typeOf';
 export type IReturnedOrder = Pick<IOrderWithoutAcceptedOffers, 'project' | 'typeOf' | 'orderNumber' | 'dateReturned' | 'id' | 'customer' | 'returner' | 'seller' | 'price' | 'priceCurrency' | 'orderDate'> & {
@@ -142,19 +143,19 @@ export declare class OrderRepo {
     }): Promise<(IOrderWithoutAcceptedOffers & {
         id: string;
     })[]>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, Omit<factory.order.IOrder, "id"> & {
-        acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
-    }> & Omit<factory.order.IOrder, "id"> & {
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.order.IOrder, "id"> & {
         acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, Omit<factory.order.IOrder, "id"> & {
-        acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
-    }> & Omit<factory.order.IOrder, "id"> & {
+    } & {
+        __v: number;
+    }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.order.IOrder, "id"> & {
         acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }>>;
+    } & {
+        __v: number;
+    }) | null>;
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<factory.order.IOrder>;
         $unset: any;

package/lib/chevre/repo/order.js

@@ -853,6 +853,7 @@ class OrderRepo {
         }, {
             $set: {
                 'paymentMethods.$[invoice].paymentMethod.identifier': params.invoice.paymentMethod.identifier,
+                // eslint-disable-next-line no-warning-comments
                 // TODO 互換性維持対応としてtypeOfも変更しているが、そのうち廃止(2023-08-30)
                 'paymentMethods.$[invoice].typeOf': params.invoice.paymentMethod.identifier
             }
@@ -949,7 +950,8 @@ class OrderRepo {
             typeOf: { $eq: factory.order.OrderType.Order },
             acceptedOffers: {
                 $elemMatch: {
-                    'itemOffered.typeOf': { $in: [factory.reservationType.BusReservation, factory.reservationType.EventReservation] },
+                    // 'itemOffered.typeOf': { $in: [factory.reservationType.BusReservation, factory.reservationType.EventReservation] },
+                    'itemOffered.typeOf': { $in: [factory.reservationType.EventReservation] },
                     'itemOffered.id': { $eq: params.reservationId }
                 }
             },

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

@@ -28,6 +28,10 @@ export declare class OrderInTransactionRepo {
      * 注文を受注する
      */
     placeOrder(order: IPlacingOrder): Promise<void>;
+    /**
+     * 注文documentがなければ作成し、受け入れられたオファーを追加する
+     * このメソッドでdocumentが初めて生成される(typeOf:PlaceOrderとして)
+     */
     acceptOffer(params: Pick<IOrderInTransaction, 'acceptedOffers' | 'orderNumber' | 'project'>): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
     /**
      * serialNumberからオファーを除外する
@@ -45,6 +49,10 @@ export declare class OrderInTransactionRepo {
     setCustomer(params: Pick<IOrderInTransaction, 'orderNumber' | 'project'> & {
         customer: factory.order.ICustomer;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
+    /**
+     * 注文ドキュメントからcustomer属性を参照する
+     * customer未設定であれば、NotFound
+     */
     findCustomerByOrderNumber(params: {
         orderNumber: {
             $eq: string;

package/lib/chevre/repo/orderInTransaction.js

@@ -66,6 +66,10 @@ class OrderInTransactionRepo {
         }, { $set: setFields }, {})
             .exec();
     }
+    /**
+     * 注文documentがなければ作成し、受け入れられたオファーを追加する
+     * このメソッドでdocumentが初めて生成される(typeOf:PlaceOrderとして)
+     */
     async acceptOffer(params) {
         if (!Array.isArray(params.acceptedOffers) || params.acceptedOffers.length === 0) {
             return;
@@ -78,7 +82,10 @@ class OrderInTransactionRepo {
         };
         return this.orderModel.updateOne({
             typeOf: { $eq: factory.transactionType.PlaceOrder },
-            orderNumber: { $eq: params.orderNumber }
+            orderNumber: { $eq: params.orderNumber },
+            // プロジェクトでもフィルター(注文番号重複バグがあったため)(2026-02-21~)
+            // 万が一異なるプロジェクトで同じ注文番号でオファーを受け入れようとしても、DBにインデックスによってDuplicateKey
+            'project.id': { $eq: params.project.id }
         }, {
             $setOnInsert: setOnInsert,
             $push: {
@@ -130,7 +137,10 @@ class OrderInTransactionRepo {
         const { customer, orderNumber, project } = params;
         const filter = {
             typeOf: { $eq: factory.transactionType.PlaceOrder },
-            orderNumber: { $eq: orderNumber }
+            orderNumber: { $eq: orderNumber },
+            // プロジェクトでもフィルター(注文番号重複バグがあったため)(2026-02-21~)
+            // 万が一異なるプロジェクトで同じ注文番号でオファーを受け入れようとしても、DBにインデックスによってDuplicateKey
+            'project.id': { $eq: project.id }
         };
         const setOnInsert = {
             typeOf: factory.transactionType.PlaceOrder,
@@ -145,6 +155,10 @@ class OrderInTransactionRepo {
         }, { upsert: true })
             .exec();
     }
+    /**
+     * 注文ドキュメントからcustomer属性を参照する
+     * customer未設定であれば、NotFound
+     */
     async findCustomerByOrderNumber(params) {
         const doc = await this.orderModel.findOne({
             orderNumber: { $eq: params.orderNumber.$eq }

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

@@ -9,9 +9,10 @@ export declare class OrderNumberRepo {
         connection: Connection;
     });
     /**
-     * タイムスタンプから発行する
+     * 注文日時から新しい注文番号を発行する
+     * グローバルユニークである前提
      */
-    publishByTimestamp(params: {
+    issueOrderNumber(params: {
         project: {
             alternateName: string;
         };

package/lib/chevre/repo/orderNumber.js

@@ -34,11 +34,6 @@ const setting_1 = require("./mongoose/schemas/setting");
 const transactionNumber_2 = require("./mongoose/schemas/transactionNumber");
 const transactionNumberCounter_1 = require("./transactionNumberCounter");
 const ORDER_NUMBER_SEPARATOR = '-';
-const defaultVersioningForceProjects = [
-    'HMX',
-    'SMT',
-    'KOJ'
-];
 /**
  * 注文番号リポジトリ
  */
@@ -59,16 +54,23 @@ class OrderNumberRepo {
     //     return orderNumber;
     // }
     /**
-     * タイムスタンプから発行する
+     * 注文日時から新しい注文番号を発行する
+     * グローバルユニークである前提
      */
-    async publishByTimestamp(params) {
-        const { fpeSecret, version, validFrom, versioningForceProjects, versioningExceptionProjects } = await this.findSetting();
+    async issueOrderNumber(params) {
+        const { fpeSecret, version, validFrom
+        // versioningForceProjects
+        // versioningExceptionProjects
+         } = await this.findSetting();
         const timestamp = (0, moment_timezone_1.default)(params.orderDate)
             .valueOf()
             .toString();
+        // const projectPrefix = params.project.alternateName
+        //     .toUpperCase();
         const projectPrefix = params.project.alternateName
-            .toUpperCase();
-        const dataFeedIdentifier = `${projectPrefix}:${timestamp}`;
+            .toUpperCase().at(0);
+        // const dataFeedIdentifier = `${projectPrefix}:${timestamp}`;
+        const dataFeedIdentifier = timestamp; // reconsider increment scope(2026-02-21~)
         const dataFeedExpires = (0, moment_timezone_1.default)(params.orderDate)
             .add(1, 'minute') // ミリ秒でカウントしていくので、注文日時後1分で十分
             .toDate();
@@ -78,18 +80,12 @@ class OrderNumberRepo {
             expires: dataFeedExpires
         });
         let orderNumber;
-        let useVersioning = (validFrom instanceof Date && (0, moment_timezone_1.default)(validFrom)
-            .isSameOrBefore(params.orderDate))
-            // versioningForceProjectsであれば強制的にversioning(2026-02-05~)
-            || versioningForceProjects.includes(projectPrefix);
-        // versioningExceptionProjectsであれば強制的にversioning不使用(2026-02-10~)
-        if (versioningExceptionProjects.includes(projectPrefix)) {
-            useVersioning = false;
-        }
+        const useVersioning = (validFrom instanceof Date && (0, moment_timezone_1.default)(validFrom)
+            .isSameOrBefore(params.orderDate));
         if (typeof fpeSecret === 'string' && typeof version === 'string' && useVersioning) {
             const transactionFactory = new transactionNumber_1.TransactionNumberFactory({ fpeSecret, version });
             orderNumber = transactionFactory.generate(timestamp, incrReply);
-            orderNumber = `${projectPrefix.at(0)}${orderNumber}`; // 桁数をversion0に合わせるためにエイリアスの1文字目のみを採用
+            orderNumber = `${projectPrefix}${orderNumber}`; // 桁数をversion0に合わせるためにエイリアスの1文字目のみを採用
             orderNumber = `${[
                 orderNumber.slice(0, 4),
                 orderNumber.slice(4, 11),
@@ -138,11 +134,11 @@ class OrderNumberRepo {
             .exec();
         if (setting === null || setting.orderNumber === undefined) {
             return {
-                versioningForceProjects: [],
-                versioningExceptionProjects: []
+            // versioningForceProjects: []
+            // versioningExceptionProjects: []
             };
         }
-        const { fpeSecret, version, validFrom, versioningForceProjects, versioningExceptionProjects } = setting.orderNumber;
+        const { fpeSecret, version, validFrom } = setting.orderNumber;
         if (typeof fpeSecret !== 'string' || fpeSecret === '') {
             throw new factory.errors.NotFound('setting.orderNumber.secret');
         }
@@ -153,12 +149,11 @@ class OrderNumberRepo {
             throw new factory.errors.NotFound('setting.orderNumber.validFrom must be Date');
         }
         return {
-            fpeSecret, version, validFrom,
-            versioningForceProjects: [
-                ...(Array.isArray(versioningForceProjects)) ? versioningForceProjects : [],
-                ...defaultVersioningForceProjects
-            ],
-            versioningExceptionProjects: (Array.isArray(versioningExceptionProjects)) ? versioningExceptionProjects : []
+            fpeSecret, version, validFrom
+            // versioningForceProjects: [
+            //     ...(Array.isArray(versioningForceProjects)) ? versioningForceProjects : []
+            // ]
+            // versioningExceptionProjects: (Array.isArray(versioningExceptionProjects)) ? versioningExceptionProjects : []
         };
     }
 }

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

@@ -1,4 +1,5 @@
 import type { Connection } from 'mongoose';
+import { IDocType } from './mongoose/schemas/ownershipInfo';
 import * as 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

@@ -422,8 +422,18 @@ 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();
     }
@@ -440,14 +450,7 @@ class OwnershipInfoRepo {
             throw new 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.personType.Person) {
             newOwner = {
                 id: params.ownedBy.id,
                 typeOf: params.ownedBy.typeOf

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

@@ -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) & {};
 /**
  * 取引許可証リポジトリ
  */

package/lib/chevre/repo/passport.js

@@ -100,7 +100,7 @@ class PassportRepo {
             });
             debug('locked,', params.issueUnit.identifier, passportExpires);
         }
-        catch (error) {
+        catch (_error) {
             throw new factory.errors.AlreadyInUse('passport', [], 'passport already in use');
         }
         // const ttl = (passportExpires.isAfter(now))

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

@@ -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

@@ -186,7 +186,7 @@ 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:
@@ -209,7 +209,7 @@ class PaymentServiceRepo {
             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 },
@@ -443,11 +443,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

@@ -4,9 +4,7 @@ export type ISavingChannel = Pick<factory.serviceChannel.IServiceChannel, 'crede
     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

@@ -75,7 +75,7 @@ class PaymentServiceChannelRepo {
             if (savingId === '') {
                 throw new 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 }
@@ -98,7 +98,7 @@ class PaymentServiceChannelRepo {
             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') {

package/lib/chevre/repo/pendingReservation.js

@@ -40,7 +40,6 @@ class PendingReservationRepo {
     // private readonly aggregateReservationModel: IModel;
     pendingReservationModel;
     constructor(connection) {
-        // this.aggregateReservationModel = connection.model(modelName, createSchema());
         this.pendingReservationModel = connection.model(pendingReservation_1.modelName, (0, pendingReservation_1.createSchema)());
     }
     static CREATE_FILTER_QUERY(params) {

package/lib/chevre/repo/person.js

@@ -127,7 +127,7 @@ class PersonRepo {
                 }
                 formatedPhoneNumber = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.E164);
             }
-            catch (error) {
+            catch (_error) {
                 throw new factory.errors.Argument('telephone', 'Invalid phone number');
             }
         }
@@ -170,7 +170,7 @@ class PersonRepo {
                         }
                         userAttributesValue = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.E164);
                     }
-                    catch (error) {
+                    catch (_error) {
                         throw new factory.errors.Argument('custome:telephone', 'Invalid phone number');
                     }
                 }

package/lib/chevre/repo/place/busStop.js

@@ -114,7 +114,7 @@ class BusStopRepo {
         }
         else {
             // 上書き禁止属性を除外(2022-08-24~)
-            const { id, branchCode, project, typeOf, ...updateFields } = params;
+            const { id, branchCode, project, typeOf, ...updateFields } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
             doc = await this.civicStructureModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
                 .exec();
         }

package/lib/chevre/repo/place/hasPOS.js

@@ -109,7 +109,7 @@ class HasPOSRepo {
         if (doc === null) {
             throw new factory.errors.AlreadyInUse('hasPOS', ['id']);
         }
-        return doc.toObject();
+        return doc.toObject({ virtuals: true });
     }
     async updateByBranchCode(params) {
         const doc = await this.civicStructureModel.findOneAndUpdate({
@@ -133,7 +133,7 @@ class HasPOSRepo {
         if (doc === null) {
             throw new factory.errors.NotFound('hasPOS');
         }
-        return doc.toObject();
+        return doc.toObject({ virtuals: true });
     }
     async deleteByBranchCode(params) {
         const doc = await this.civicStructureModel.findOneAndUpdate({
@@ -149,7 +149,7 @@ class HasPOSRepo {
         if (doc === null) {
             throw new factory.errors.NotFound('hasPOS');
         }
-        return doc.toObject();
+        return doc.toObject({ virtuals: true });
     }
 }
 exports.HasPOSRepo = HasPOSRepo;