@chevre/domain 28.0.0-alpha.36 → 28.0.0-alpha.38

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

@@ -1,6 +1,6 @@
 import type { Connection } from 'mongoose';
 import { factory } from '../factory';
-type IFindParams = Pick<factory.accountTitle.ISearchConditions, 'codeValue' | 'limit' | 'name' | 'page' | 'project' | 'sort' | 'additionalProperty' | 'inCodeSet'>;
+type IFindParams = Pick<factory.accountTitle.ISearchConditions, 'codeValue' | 'limit' | 'name' | 'page' | 'project' | 'additionalProperty' | 'inCodeSet'>;
 /**
  * 細目管理リポジトリ
  */
@@ -27,7 +27,16 @@ export declare class AdminAccountTitleRepo {
     }): Promise<{
         id: string;
     }>;
-    findAccountTitles(params: IFindParams): Promise<Pick<factory.accountTitle.IAccountTitle, 'codeValue' | 'name' | 'project' | 'typeOf'>[]>;
+    findAccountTitles(params: IFindParams): Promise<(Pick<factory.accountTitle.IAccountTitle, 'codeValue' | 'name' | 'additionalProperty'> & {
+        inCodeSet: {
+            codeValue: string;
+            name?: string;
+            inCodeSet: {
+                codeValue: string;
+                name?: string;
+            };
+        };
+    })[]>;
     deleteAccountTitleByCodeValue(params: {
         projectId: string;
         codeValue: string;

package/lib/chevre/repo/adminAccountTitle.js

@@ -173,7 +173,6 @@ class AdminAccountTitleRepo {
                             codeValue: '$codeValue',
                             name: '$name'
                         },
-                        inDefinedTermSet: '$hasCategoryCode.inDefinedTermSet'
                     },
                     additionalProperty: '$hasCategoryCode.hasCategoryCode.additionalProperty'
                 }

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

@@ -24,7 +24,7 @@ export declare class AdminAccountTitleCategoryRepo {
     updateAccountTitleCategory(params: Pick<factory.accountTitle.IAccountTitle, 'codeValue' | 'name' | 'project'>): Promise<{
         id: string;
     }>;
-    findAccountTitleCategories(params: IFindParams): Promise<Pick<factory.accountTitle.IAccountTitle, 'codeValue' | 'name' | 'project' | 'typeOf'>[]>;
+    findAccountTitleCategories(params: IFindParams): Promise<Pick<factory.accountTitle.IAccountTitle, 'codeValue' | 'name'>[]>;
     deleteAccountTitleCategoryByCodeValue(params: {
         projectId: string;
         codeValue: string;

package/lib/chevre/repo/adminAccountTitleCategory.js

@@ -94,15 +94,13 @@ class AdminAccountTitleCategoryRepo {
             _id: 0,
             codeValue: 1,
             name: 1,
-            project: 1,
-            typeOf: 1
         });
         if (typeof params.limit === 'number' && typeof params.page === 'number') {
             query.limit(params.limit)
                 .skip(params.limit * (params.page - 1));
         }
         if (typeof params.sort?.codeValue === 'number') {
-            query.sort({ params: params.sort.codeValue });
+            query.sort({ codeValue: params.sort.codeValue });
         }
         return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
             .lean()

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

@@ -1,6 +1,6 @@
 import type { Connection } from 'mongoose';
 import { factory } from '../factory';
-type IFindParams = Pick<factory.accountTitle.ISearchConditions, 'codeValue' | 'limit' | 'name' | 'page' | 'project' | 'sort'> & {
+type IFindParams = Pick<factory.accountTitle.ISearchConditions, 'codeValue' | 'limit' | 'name' | 'page' | 'project'> & {
     inCodeSet?: {
         codeValue?: string | {
             $eq?: string;

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

@@ -1,7 +1,7 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import { IVirtuals } from '../virtuals';
 import { factory } from '../../../factory';
-type IDocType = Omit<factory.project.IProject, 'id'> & {
+type IDocType = Pick<factory.project.IProject, 'alternateName' | 'hasMerchantReturnPolicy' | 'logo' | 'name' | 'settings' | 'subscription' | 'typeOf'> & {
     _id: string;
     aggregateReservation?: any;
     makesOffer?: factory.project.IMakesOffer[];

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

@@ -47,7 +47,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, {}> & Omit<factory.project.IProject, "id"> & {
+    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"> & {
         _id: string;
         aggregateReservation?: any;
         makesOffer?: factory.project.IMakesOffer[];
@@ -55,7 +55,7 @@ export declare class ProjectRepo {
         _id: string;
     }> & {
         __v: number;
-    }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.project.IProject, "id"> & {
+    }, import("mongoose").QueryOptions<IDocType>, (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;
         aggregateReservation?: any;
         makesOffer?: factory.project.IMakesOffer[];

package/lib/chevre/repo/projectMakesOffer.js

@@ -42,8 +42,8 @@ class ProjectMakesOfferRepo {
         ]);
         if (typeof params.limit === 'number' && params.limit > 0) {
             const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-            aggregate.limit(params.limit * page)
-                .skip(params.limit * (page - 1));
+            aggregate.skip(params.limit * (page - 1))
+                .limit(params.limit);
         }
         return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
             .exec();

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "11.1.0-alpha.7",
+    "@chevre/factory": "11.1.0-alpha.8",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "28.0.0-alpha.36"
+  "version": "28.0.0-alpha.38"
 }