@chevre/domain 28.2.0-alpha.2 → 28.2.0-alpha.4

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

@@ -1,6 +1,7 @@
-import { Connection, FilterQuery, Types, mongo } from 'mongoose';
+import { Connection, Types } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
-import { IDocType, IDocTypeAsProduct } from './mongoose/schemas/product';
+import { IDocType, IDocTypeAsProduct, IModel } from './mongoose/schemas/product';
 type IKeyOfProjection = keyof factory.product.IProduct | 'hasOfferCatalog.id';
 /**
  * プロダクト検索条件
@@ -13,7 +14,7 @@ type IUnsetKey = keyof Pick<factory.product.IProduct, 'additionalProperty' | 'av
 export declare class ProductRepo {
     private readonly productModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: ISearchConditions4product): FilterQuery<factory.product.IProduct>[];
+    static CREATE_MONGO_CONDITIONS(params: ISearchConditions4product): FilterQuery<IDocType>[];
     /**
      * プロダクトを検索する
      */
@@ -64,7 +65,7 @@ export declare class ProductRepo {
         };
         $unset?: Partial<Record<IUnsetKey, 1>>;
     }[]): Promise<{
-        bulkWriteResult?: mongo.BulkWriteResult;
+        bulkWriteResult?: Awaited<ReturnType<IModel['bulkWrite']>>;
         modifiedProducts?: {
             id: string;
         }[];
@@ -79,7 +80,7 @@ export declare class ProductRepo {
         hasOfferCatalog: {
             id: string;
         };
-    }): Promise<mongo.DeleteResult>;
+    }): Promise<import("mongodb").DeleteResult>;
     /**
      * プロジェクト指定で削除する
      */
@@ -98,7 +99,7 @@ export declare class ProductRepo {
         __v: number;
     }) | null>;
     unsetUnnecessaryFields(params: {
-        filter: FilterQuery<factory.product.IProduct>;
+        filter: FilterQuery<IDocType>;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
     migrateHasOfferCatalogItemListElement(params: {

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

@@ -1,4 +1,5 @@
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { IDocType } from './mongoose/schemas/project';
 import { factory } from '../factory';
 type IKeyOfProjection = keyof factory.project.IProject;
@@ -9,7 +10,7 @@ type IKeyOfProjection = keyof factory.project.IProject;
 export declare class ProjectRepo {
     private readonly projectModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.project.ISearchConditions): FilterQuery<factory.project.IProject>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.project.ISearchConditions): FilterQuery<IDocType>[];
     findById(params: {
         id: string;
         inclusion: IKeyOfProjection[];
@@ -43,7 +44,7 @@ export declare class ProjectRepo {
     deleteById(params: {
         id: string;
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<factory.project.IProject>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<factory.project.IProject, "name" | "typeOf" | "logo" | "alternateName" | "hasMerchantReturnPolicy" | "settings" | "subscription"> & {
+    getCursor(conditions: FilterQuery<IDocType>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<factory.project.IProject, "name" | "typeOf" | "logo" | "alternateName" | "hasMerchantReturnPolicy" | "settings" | "subscription"> & {
         _id: string;
         makesOffer?: factory.project.IMakesOffer[];
     } & Required<{

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

@@ -1,5 +1,5 @@
-import type { Connection, UpdateWriteOpResult, mongo } from 'mongoose';
-import { IDocType } from './mongoose/schemas/reservation';
+import type { Connection, UpdateWriteOpResult } from 'mongoose';
+import { IDocType, IModel } from './mongoose/schemas/reservation';
 import { factory } from '../factory';
 export interface IUpdatePartiallyParams {
     additionalTicketText?: string;
@@ -76,7 +76,7 @@ export declare class ReservationRepo {
         reservationNumber: string;
         underName?: factory.reservation.IUnderName;
         broker?: factory.reservation.IBroker;
-    }): Promise<mongo.BulkWriteResult | undefined>;
+    }): Promise<Awaited<ReturnType<IModel['bulkWrite']>> | undefined>;
     /**
      * 予約取消
      */

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

@@ -1,4 +1,5 @@
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/role';
 type IRole = IDocType;
@@ -16,7 +17,7 @@ export declare class RoleRepo {
      */
     findUniquePermissionsByRoleName(params: {
         roleName: {
-            $in: string[];
+            $in: factory.role.organizationRole.RoleName[];
         };
     }): Promise<string[]>;
     addPermissionIfNotExists(params: {

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

@@ -1,4 +1,5 @@
-import { AnyExpression, Connection, FilterQuery, QueryOptions, Types } from 'mongoose';
+import { AnyExpression, Connection, QueryOptions, Types } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { IDocType } from './mongoose/schemas/seller';
 import { factory } from '../factory';
 export type ISellerWithId = Pick<factory.seller.ISeller, 'additionalProperty' | 'branchCode' | 'hasMerchantReturnPolicy' | 'id' | 'makesOffer' | 'name' | 'project' | 'telephone' | 'typeOf' | 'url'> & {
@@ -32,7 +33,7 @@ type IKeyOfProjection = keyof ISellerWithId;
 export declare class SellerRepo {
     private readonly sellerModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.seller.ISearchConditions & IMemberSearchConditions): FilterQuery<factory.seller.ISeller>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.seller.ISearchConditions & IMemberSearchConditions): FilterQuery<IDocType>[];
     static CREATE_AGGREGATE_SELLERS_PROJECTION(inclusions: (Exclude<keyof ISellerByAggregate, 'id'>)[]): Record<string, AnyExpression>;
     /**
      * 販売者を保管する
@@ -75,7 +76,7 @@ export declare class SellerRepo {
         id: string;
         makesOffer: factory.seller.IMakesOffer;
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<factory.seller.ISeller>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<factory.seller.ISeller, "name" | "typeOf" | "branchCode" | "additionalProperty" | "project" | "url" | "telephone" | "makesOffer" | "hasMerchantReturnPolicy"> & {
+    getCursor(conditions: FilterQuery<IDocType>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<factory.seller.ISeller, "name" | "typeOf" | "branchCode" | "additionalProperty" | "project" | "url" | "telephone" | "makesOffer" | "hasMerchantReturnPolicy"> & {
         paymentAccepted?: factory.seller.IPaymentAccepted[];
     } & {
         _id: Types.ObjectId;

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

@@ -1,5 +1,6 @@
-import { Connection, mongo } from 'mongoose';
+import { Connection } from 'mongoose';
 import { factory } from '../factory';
+import { IModel } from './mongoose/schemas/seller';
 type IMakesOffer = Pick<factory.seller.IMakesOffer, 'typeOf' | 'availableAtOrFrom' | 'eligibleTransactionDuration'>;
 type IMakesOfferAsFindResult = IMakesOffer & {
     offeredBy: {
@@ -50,7 +51,7 @@ export declare class SellerMakesOfferRepo {
                 id: string;
             };
         }[];
-    }): Promise<mongo.BulkWriteResult | undefined>;
+    }): Promise<Awaited<ReturnType<IModel['bulkWrite']>> | undefined>;
     /**
      * 販売者とアプリケーションに対してオファーが存在すれば削除する
      */
@@ -66,6 +67,6 @@ export declare class SellerMakesOfferRepo {
                 id: string;
             };
         }[];
-    }): Promise<mongo.BulkWriteResult | undefined>;
+    }): Promise<Awaited<ReturnType<IModel['bulkWrite']>> | undefined>;
 }
 export {};

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

@@ -1,4 +1,6 @@
-import { Connection, FilterQuery } from 'mongoose';
+import { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
+import { IDocType } from './mongoose/schemas/sellerReturnPolicy';
 import { factory } from '../factory';
 export type ISavingReturnPolicy = Pick<factory.sellerReturnPolicy.ISellerReturnPolicy, 'applicablePaymentMethod' | 'identifier' | 'itemCondition' | 'merchantReturnDays' | 'name' | 'project' | 'restockingFee' | 'typeOf'> & {
     id?: never;
@@ -16,7 +18,7 @@ type IKeyOfProjection = keyof ISellerReturnPolicyWithId;
 export declare class SellerReturnPolicyRepo {
     private readonly sellerReturnPolicyModel;
     constructor(connection: Connection);
-    static CREATE_FILTER_QUERY(params: factory.sellerReturnPolicy.ISearchConditions): FilterQuery<factory.sellerReturnPolicy.ISellerReturnPolicy>[];
+    static CREATE_FILTER_QUERY(params: factory.sellerReturnPolicy.ISearchConditions): FilterQuery<IDocType>[];
     save(params: {
         id?: string;
         attributes: ISavingReturnPolicy & IUnset;

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

@@ -1,5 +1,6 @@
-import type { Connection, FilterQuery } from 'mongoose';
-import { ISetting, IStorageSettings } from './mongoose/schemas/setting';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
+import { IDocType, ISetting, IStorageSettings } from './mongoose/schemas/setting';
 type IKeyOfProjection = Exclude<keyof ISetting, 'jwt' | 'project' | 'waiter' | 'integration'>;
 type IGlobalSetting = Pick<ISetting, 'defaultSenderEmail' | 'orderNumber' | 'quota' | 'storage' | 'transactionNumber' | 'useInformResourceTypes' | 'useMongo4confirmationNumberFrom' | 'useMongo4orderNumberFrom' | 'useMongo4transactionNumberFrom' | 'useMongoAsStockHolder' | 'useMongoAsStockHolderProjects' | 'userPoolIdNew' | 'userPoolIdOld'>;
 export { IGlobalSetting as ISetting };
@@ -25,7 +26,7 @@ export declare class SettingRepo {
         value: number;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
     unsetUnnecessaryFields(params: {
-        filter: FilterQuery<ISetting>;
+        filter: FilterQuery<IDocType>;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
 }

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

@@ -1,6 +1,7 @@
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
-import { ITicket, ITicketIssuedBy } from './mongoose/schemas/ticket';
+import { ITicket, ITicketIssuedBy, IDocType } from './mongoose/schemas/ticket';
 export { ITicket };
 type IIssueParams = Pick<ITicket, 'ticketToken'> & {
     project: {
@@ -33,7 +34,7 @@ type IKeyOfProjection = keyof ITicket;
 export declare class TicketRepo {
     private readonly ticketModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<ITicket>[];
+    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<IDocType>[];
     /**
      * 承認コードからチケットを発行する
      */

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

@@ -1,4 +1,5 @@
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { FilterQuery } from '../mongoose/types';
 import { factory } from '../../factory';
 type IKeyOfProjection = 'agent' | 'endDate' | 'expires' | 'project' | 'startDate' | 'status' | 'typeOf' | 'instrument' | 'object' | 'seller' | 'result' | 'tasksExportAction';
 export type ITransactionInProgress = Pick<factory.transaction.placeOrder.ITransaction, IKeyOfProjection> & {
@@ -24,7 +25,20 @@ type IFindParams = Pick<factory.transaction.placeOrder.ISearchConditions, 'agent
 export declare class PlaceOrderRepo {
     private readonly transactionModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: IFindParams): FilterQuery<import("@chevre/factory/lib/chevre/transaction/placeOrder").ITransaction>[];
+    static CREATE_MONGO_CONDITIONS(params: IFindParams): FilterQuery<{
+        object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
+        endDate?: Date | undefined;
+        startDate: Date;
+        typeOf: factory.transactionType.PlaceOrder;
+        project: import("@chevre/factory/lib/chevre/transaction").IProject;
+        seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
+        expires: Date;
+        result?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IResult | undefined;
+        instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
+        agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
+        status: factory.transactionStatusType;
+        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction/placeOrder").ITasksExportAction | undefined;
+    }>[];
     countPlaceOrder(params: IFindParams): Promise<{
         count: number;
     }>;

package/lib/chevre/repo/transactionNumberCounter.js

@@ -71,7 +71,7 @@ class TransactionNumberCounterRepo {
                 throw error;
             }
         }
-        if (doc === undefined) {
+        if (doc === undefined || doc === null) {
             throw new factory_1.factory.errors.NotFound('DataFeed');
         }
         const incrReply = doc.interactionStatistic?.userInteractionCount;

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

@@ -1,5 +1,7 @@
-import { Connection, FilterQuery } from 'mongoose';
+import { Connection } from 'mongoose';
+import type { FilterQuery } from './mongoose/types';
 import { factory } from '../factory';
+import { IDocType } from './mongoose/schemas/webSite';
 export type ISavingWebSite = Pick<factory.creativeWork.certification.webSite.ICertification, 'about' | 'certificationStatus' | 'project' | 'auditDate'> & {
     id?: never;
     datePublished?: never;
@@ -19,8 +21,8 @@ type IKeyOfProjection = keyof factory.creativeWork.certification.webSite.ICertif
 export declare class WebSiteRepo {
     private readonly webSiteModel;
     constructor(connection: Connection);
-    static CREATE_FILTER_QUERY(params: factory.creativeWork.certification.webSite.ISearchConditions): FilterQuery<factory.creativeWork.certification.webSite.ICertification>[];
-    save(params: {
+    static CREATE_FILTER_QUERY(params: factory.creativeWork.certification.webSite.ISearchConditions): FilterQuery<IDocType>[];
+    saveWebiSite(params: {
         id?: string;
         attributes: ISavingWebSite & IUnset;
     }): Promise<{

package/lib/chevre/repo/webSite.js

@@ -41,7 +41,7 @@ class WebSiteRepo {
         }
         return andConditions;
     }
-    async save(params) {
+    async saveWebiSite(params) {
         let doc;
         let savedId;
         const savingId = params.id;

package/package.json

@@ -46,7 +46,7 @@
     "csvtojson": "^2.0.10",
     "dependency-cruiser": "17.3.8",
     "eslint": "9.39.2",
-    "mongoose": "8.24.8",
+    "mongoose": "8.24.9",
     "rimraf": "6.1.3",
     "size-limit": "12.0.0",
     "typescript": "5.9.3",
@@ -89,5 +89,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "28.2.0-alpha.2"
+  "version": "28.2.0-alpha.4"
 }