@cinerino/sdk 15.0.0-alpha.2 → 15.0.0-alpha.21

package/lib/abstract/chevreConsole/order/factory.d.ts

@@ -1,4 +1,10 @@
 import { factory } from '../../factory';
+type IKeyOfProjection = keyof factory.order.IOrder | '_id';
+/**
+ * 注文検索時projection
+ * 0->1(2024-07-29~)
+ */
+export type IProjection = Partial<Record<IKeyOfProjection, 1>>;
 /**
  * オファー展開の検索結果としての注文
  */
@@ -15,9 +21,90 @@ export interface ISearchOrdersOptions {
      */
     $unwindAcceptedOffers?: '1';
 }
+/**
+ * 管理者による注文検索条件
+ */
+export type IFindParams = Pick<factory.order.ISearchConditions, 'confirmationNumbers' | 'name' | 'orderDate' | 'orderNumbers' | 'orderStatuses' | 'sort'> & {
+    $projection?: IProjection;
+    $projectDisabled?: '1';
+} & ISearchOrdersOptions & {
+    /**
+     * min: 1
+     * max: 20
+     */
+    limit: number;
+    /**
+     * min: 1
+     */
+    page: number;
+    customer?: Pick<factory.order.ICustomerSearchConditions, 'identifiers' | 'ids'> & {
+        givenName?: {
+            $eq?: string;
+            $regex?: string;
+        };
+        familyName?: {
+            $eq?: string;
+            $regex?: string;
+        };
+        email?: {
+            $eq?: string;
+            $regex?: string;
+        };
+        telephone?: string;
+    };
+    /**
+     * 決済方法
+     */
+    paymentMethods?: Pick<factory.order.IPaymentMethodsSearchConditions, 'accountIds' | 'paymentMethodIds'> & {
+        /**
+         * 決済方法区分コード
+         */
+        typeOfs?: string[];
+        /**
+         * 追加特性
+         */
+        additionalProperty?: {
+            /**
+             * すべてに一致する
+             */
+            $all?: factory.order.IIdentifier;
+        };
+    };
+    /**
+     * オファー
+     */
+    acceptedOffers?: {
+        itemOffered?: {
+            /**
+             * 予約ID
+             */
+            ids?: string[];
+            /**
+             * 予約番号
+             */
+            reservationNumbers?: string[];
+            reservationFor?: Pick<factory.order.IReservationForSearchConditions, 'ids' | 'location' | 'startFrom' | 'startThrough' | 'inSessionFrom' | 'inSessionThrough'> & {
+                superEvent?: {
+                    /**
+                     * 施設コンテンツID
+                     */
+                    ids?: string[];
+                    /**
+                     * 施設
+                     */
+                    location?: {
+                        /**
+                         * 施設コード
+                         */
+                        branchCodes?: string[];
+                    };
+                };
+            };
+        };
+    };
+};
 export type IAcceptedOffer = factory.order.IAcceptedOffer;
 export type IReturner = Pick<factory.iam.IMemberOfRole, 'typeOf' | 'id' | 'name'>;
-export type IExternalOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'seller' | 'customer' | 'confirmationNumber' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'name' | 'orderStatus' | 'orderedItem' | 'paymentMethods'>;
 export interface IUpdateChangeableAttributesParams {
     confirmationNumber: string;
     orderNumber: string;
@@ -26,3 +113,4 @@ export interface IUpdateChangeableAttributesParams {
      */
     name?: string;
 }
+export {};

package/lib/abstract/chevreConsole/order.d.ts

@@ -1,14 +1,9 @@
 import { factory } from '../factory';
 import { Service } from '../service';
-import { IExternalOrder } from './order/factory';
 /**
  * 注文サービス
  */
 export declare class OrderService extends Service {
-    /**
-     * 取引なしに作成する
-     */
-    createWithoutTransaction(params: IExternalOrder): Promise<IExternalOrder>;
     /**
      * 決済取引確定
      */

package/lib/abstract/chevreConsole/order.js

@@ -7,18 +7,6 @@ const service_1 = require("../service");
  * 注文サービス
  */
 class OrderService extends service_1.Service {
-    /**
-     * 取引なしに作成する
-     */
-    async createWithoutTransaction(params) {
-        return this.fetch({
-            uri: `/orders`,
-            method: 'POST',
-            body: params,
-            expectedStatusCodes: [http_status_1.status.CREATED]
-        })
-            .then(async (response) => response.json());
-    }
     /**
      * 決済取引確定
      */

package/lib/abstract/chevreConsole/person.d.ts

@@ -1,44 +1,13 @@
 import { factory } from '../factory';
-import { IOptions, IProjectionSearchConditions, ISearchResult, Service } from '../service';
-import { ISearchOrdersOptions } from './order/factory';
-export type IPerson = factory.person.IPerson;
+import { IOptions, Service } from '../service';
 /**
  * 会員サービス
  */
 export declare class PersonService extends Service<IOptions> {
-    /**
-     * プロフィール検索
-     */
-    getProfile(params: {
-        /**
-         * 未指定の場合`me`がセットされます
-         */
-        id?: string;
-        iss: string;
-    }): Promise<factory.person.IProfile>;
-    /**
-     * プロフィール更新
-     */
-    updateProfile(params: factory.person.IProfile & {
-        /**
-         * 未指定の場合`me`がセットされます
-         */
-        id?: string;
-        iss: string;
-    }): Promise<void>;
-    /**
-     * 注文を検索する
-     */
-    searchOrders(params: factory.order.ISearchConditions & {
-        /**
-         * 未指定の場合`me`がセットされます
-         */
-        id?: string;
-    } & IProjectionSearchConditions & ISearchOrdersOptions): Promise<ISearchResult<factory.order.IOrder[]>>;
     /**
      * 会員検索
      */
-    search(params: {
+    findPeople(params: {
         id?: string;
         username?: string;
         email?: string;
@@ -46,29 +15,12 @@ export declare class PersonService extends Service<IOptions> {
         givenName?: string;
         familyName?: string;
         iss: string;
-    }): Promise<ISearchResult<IPerson[]>>;
+    }): Promise<factory.person.IPerson[]>;
     /**
      * ユーザー取得
      */
-    findById(params: {
-        /**
-         * 未指定の場合`me`がセットされます
-         */
-        id?: string;
-        iss: string;
-    }): Promise<IPerson>;
-    /**
-     * 会員削除
-     */
-    deleteById(params: {
-        /**
-         * 未指定の場合`me`がセットされます
-         */
-        id?: string;
-        /**
-         * 管理者による削除の場合、物理削除かどうかを指定できます
-         */
-        physically?: boolean;
+    findPersonById(params: {
+        id: string;
         iss: string;
-    }): Promise<void>;
+    }): Promise<factory.person.IPerson>;
 }

package/lib/abstract/chevreConsole/person.js

@@ -7,90 +7,30 @@ const service_1 = require("../service");
  * 会員サービス
  */
 class PersonService extends service_1.Service {
-    /**
-     * プロフィール検索
-     */
-    async getProfile(params) {
-        const id = (typeof params.id === 'string') ? params.id : 'me';
-        return this.fetch({
-            uri: `/people/${id}/profile`,
-            method: 'GET',
-            expectedStatusCodes: [http_status_1.status.OK],
-            qs: { iss: params.iss }
-        })
-            .then(async (response) => response.json());
-    }
-    /**
-     * プロフィール更新
-     */
-    async updateProfile(params) {
-        const id = (typeof params.id === 'string') ? params.id : 'me';
-        await this.fetch({
-            uri: `/people/${id}/profile`,
-            method: 'PATCH',
-            body: params,
-            expectedStatusCodes: [http_status_1.status.NO_CONTENT],
-            qs: { iss: params.iss }
-        });
-    }
-    /**
-     * 注文を検索する
-     */
-    async searchOrders(params) {
-        const id = (typeof params.id === 'string') ? params.id : 'me';
-        return this.fetch({
-            uri: `/people/${id}/orders`,
-            method: 'GET',
-            qs: params,
-            expectedStatusCodes: [http_status_1.status.OK]
-        })
-            .then(async (response) => {
-            return {
-                data: await response.json()
-            };
-        });
-    }
     /**
      * 会員検索
      */
-    async search(params) {
+    async findPeople(params) {
         return this.fetch({
             uri: '/people',
             method: 'GET',
             qs: params,
             expectedStatusCodes: [http_status_1.status.OK]
         })
-            .then(async (response) => {
-            return {
-                data: await response.json()
-            };
-        });
+            .then(async (response) => response.json());
     }
     /**
      * ユーザー取得
      */
-    async findById(params) {
-        const id = (typeof params.id === 'string') ? params.id : 'me';
+    async findPersonById(params) {
+        const { id, iss } = params;
         return this.fetch({
             uri: `/people/${id}`,
             method: 'GET',
             expectedStatusCodes: [http_status_1.status.OK],
-            qs: { iss: params.iss }
+            qs: { iss }
         })
             .then(async (response) => response.json());
     }
-    /**
-     * 会員削除
-     */
-    async deleteById(params) {
-        const id = (typeof params.id === 'string') ? params.id : 'me';
-        await this.fetch({
-            uri: `/people/${id}`,
-            method: 'DELETE',
-            body: params,
-            expectedStatusCodes: [http_status_1.status.NO_CONTENT],
-            qs: { iss: params.iss }
-        });
-    }
 }
 exports.PersonService = PersonService;

package/lib/abstract/chevreConsole.d.ts

@@ -3,7 +3,6 @@ import type { AccountingReportService } from './chevreConsole/accountingReport';
 import type { AccountTitleService } from './chevreConsole/accountTitle';
 import type { ActionService } from './chevreConsole/action';
 import type { AdditionalPropertyService } from './chevreConsole/additionalProperty';
-import type { AdvanceBookingRequirementService } from './chevreConsole/advanceBookingRequirement';
 import type { AggregateOfferService } from './chevreConsole/aggregateOffer';
 import type { AggregateReservationService } from './chevreConsole/aggregateReservation';
 import type { AggregationService } from './chevreConsole/aggregation';
@@ -44,7 +43,6 @@ import type { PlaceService } from './chevreConsole/place';
 import type { HasPOSService } from './chevreConsole/place/hasPOS';
 import type { PriceSpecificationService } from './chevreConsole/priceSpecification';
 import type { ProductService } from './chevreConsole/product';
-import type { ProductModelService } from './chevreConsole/productModel';
 import type { ProjectService } from './chevreConsole/project';
 import type { ProjectMakesOfferService } from './chevreConsole/projectMakesOffer';
 import type { ReservationService } from './chevreConsole/reservation';
@@ -89,13 +87,6 @@ export declare namespace service {
     namespace AdditionalProperty {
         let svc: typeof AdditionalPropertyService | undefined;
     }
-    /**
-     * 事前予約要件サービス
-     */
-    type AdvanceBookingRequirement = AdvanceBookingRequirementService;
-    namespace AdvanceBookingRequirement {
-        let svc: typeof AdvanceBookingRequirementService | undefined;
-    }
     /**
      * 集計オファーサービス
      */
@@ -329,13 +320,6 @@ export declare namespace service {
     namespace Product {
         let svc: typeof ProductService | undefined;
     }
-    /**
-     * プロダクトモデルサービス
-     */
-    type ProductModel = ProductModelService;
-    namespace ProductModel {
-        let svc: typeof ProductModelService | undefined;
-    }
     /**
      * プロジェクトサービス
      */
@@ -501,7 +485,6 @@ export declare class ChevreConsole {
     createAccountTitleInstance(params: Pick<IOptions, 'project'> & Pick<IAdditionalOptions, 'seller'>): Promise<AccountTitleService>;
     createActionInstance(params: Pick<IOptions, 'project'> & Pick<IAdditionalOptions, 'seller'>): Promise<ActionService>;
     createAdditionalPropertyInstance(params: Pick<IOptions, 'project'> & Pick<IAdditionalOptions, 'seller'>): Promise<AdditionalPropertyService>;
-    createAdvanceBookingRequirementInstance(params: Pick<IOptions, 'project'> & Pick<IAdditionalOptions, 'seller'>): Promise<AdvanceBookingRequirementService>;
     createAggregateOfferInstance(params: Pick<IOptions, 'project'> & Pick<IAdditionalOptions, 'seller'>): Promise<AggregateOfferService>;
     createAggregateReservationInstance(params: Pick<IOptions, 'project'> & Pick<IAdditionalOptions, 'seller'>): Promise<AggregateReservationService>;
     createAggregationInstance(): Promise<AggregationService>;
@@ -535,7 +518,6 @@ export declare class ChevreConsole {
     createHasPOSInstance(params: Pick<IOptions, 'project'> & Pick<IAdditionalOptions, 'seller'>): Promise<HasPOSService>;
     createPriceSpecificationInstance(params: Pick<IOptions, 'project'> & Pick<IAdditionalOptions, 'seller'>): Promise<PriceSpecificationService>;
     createProductInstance(params: Pick<IOptions, 'project'> & Pick<IAdditionalOptions, 'seller'>): Promise<ProductService>;
-    createProductModelInstance(params: Pick<IOptions, 'project'> & Pick<IAdditionalOptions, 'seller'>): Promise<ProductModelService>;
     createProjectInstance(): Promise<ProjectService>;
     createProjectMakesOfferInstance(params: Pick<IOptions, 'project'> & Pick<IAdditionalOptions, 'seller'>): Promise<ProjectMakesOfferService>;
     createReservationInstance(params: Pick<IOptions, 'project'> & Pick<IAdditionalOptions, 'seller'>): Promise<ReservationService>;

package/lib/abstract/chevreConsole.js

@@ -48,9 +48,6 @@ var service;
     let AdditionalProperty;
     (function (AdditionalProperty) {
     })(AdditionalProperty = service.AdditionalProperty || (service.AdditionalProperty = {}));
-    let AdvanceBookingRequirement;
-    (function (AdvanceBookingRequirement) {
-    })(AdvanceBookingRequirement = service.AdvanceBookingRequirement || (service.AdvanceBookingRequirement = {}));
     let AggregateOffer;
     (function (AggregateOffer) {
     })(AggregateOffer = service.AggregateOffer || (service.AggregateOffer = {}));
@@ -153,9 +150,6 @@ var service;
     let Product;
     (function (Product) {
     })(Product = service.Product || (service.Product = {}));
-    let ProductModel;
-    (function (ProductModel) {
-    })(ProductModel = service.ProductModel || (service.ProductModel = {}));
     let Project;
     (function (Project) {
     })(Project = service.Project || (service.Project = {}));
@@ -261,13 +255,6 @@ class ChevreConsole {
         }
         return new service.AdditionalProperty.svc({ ...this.options, ...params, retryableStatusCodes: [] });
     }
-    async createAdvanceBookingRequirementInstance(params) {
-        if (service.AdvanceBookingRequirement.svc === undefined) {
-            service.AdvanceBookingRequirement.svc =
-                (await Promise.resolve().then(() => __importStar(require('./chevreConsole/advanceBookingRequirement.js')))).AdvanceBookingRequirementService;
-        }
-        return new service.AdvanceBookingRequirement.svc({ ...this.options, ...params, retryableStatusCodes: [] });
-    }
     async createAggregateOfferInstance(params) {
         if (service.AggregateOffer.svc === undefined) {
             service.AggregateOffer.svc = (await Promise.resolve().then(() => __importStar(require('./chevreConsole/aggregateOffer.js')))).AggregateOfferService;
@@ -466,12 +453,6 @@ class ChevreConsole {
         }
         return new service.Product.svc({ ...this.options, ...params, retryableStatusCodes: [] });
     }
-    async createProductModelInstance(params) {
-        if (service.ProductModel.svc === undefined) {
-            service.ProductModel.svc = (await Promise.resolve().then(() => __importStar(require('./chevreConsole/productModel.js')))).ProductModelService;
-        }
-        return new service.ProductModel.svc({ ...this.options, ...params, retryableStatusCodes: [] });
-    }
     async createProjectInstance() {
         if (service.Project.svc === undefined) {
             service.Project.svc = (await Promise.resolve().then(() => __importStar(require('./chevreConsole/project.js')))).ProjectService;

package/lib/abstract/chevreTxn/offer.d.ts

@@ -42,7 +42,7 @@ export declare class OfferService extends Service {
         id: string;
         object: {
             itemOffered: {
-                typeOf: factory.actionType.MoneyTransfer | factory.product.ProductType;
+                typeOf: factory.product.ProductType.EventService;
             };
         };
         purpose: IPurpose;

package/lib/abstract/cloud/admin/eventSeries.d.ts

@@ -18,9 +18,8 @@ export declare class EventSeriesService extends Service {
         locationId: string;
         /**
          * オファータイプ
-         * 対応決済方法管理を使用する場合、AggregateOfferを指定する
-         * AggregateOfferを指定した場合、非対応決済方法区分の指定(offers.unacceptedPaymentMethod)は無視される
+         * Offerで固定
          */
-        offerType: factory.offerType.AggregateOffer | factory.offerType.Offer;
+        offerType: factory.offerType.Offer;
     }): Promise<void>;
 }

package/lib/abstract/cloud/admin/offer.d.ts

@@ -36,7 +36,7 @@ export declare class OfferService extends Service {
     /**
      * 最大長:20
      */
-    params: Pick<factory.unitPriceOffer.ICreateParams, 'acceptedPaymentMethod' | 'addOn' | 'additionalProperty' | 'advanceBookingRequirement' | 'alternateName' | 'availability' | 'availableAtOrFrom' | 'category' | 'color' | 'description' | 'eligibleSeatingType' | 'hasMerchantReturnPolicy' | 'identifier' | 'itemOffered' | 'name' | 'priceSpecification' | 'settings' | 'validFrom' | 'validThrough'>[], options: {
+    params: Pick<factory.unitPriceOffer.ICreateParams, 'acceptedPaymentMethod' | 'addOn' | 'additionalProperty' | 'alternateName' | 'availability' | 'availableAtOrFrom' | 'category' | 'color' | 'description' | 'eligibleSeatingType' | 'hasMerchantReturnPolicy' | 'identifier' | 'itemOffered' | 'name' | 'priceSpecification' | 'settings' | 'validFrom' | 'validThrough'>[], options: {
         productType: factory.product.ProductType.EventService | factory.product.ProductType.Product;
     }): Promise<void>;
 }

package/lib/abstract/cloud/admin/order.d.ts

@@ -1,7 +1,7 @@
 import { factory } from '../../factory';
-import { ISearchResult, Service } from '../../service';
-import { IOrderAsFindByConfirmationNumberResult, ISearchOrdersOptions } from '../../chevreAsset/order/factory';
-import { IOrderAsSearchResult, IOrderAsSearchWithUnwindAcceptedOffersResult, IReturner, IUpdateChangeableAttributesParams } from '../../chevreConsole/order/factory';
+import { Service } from '../../service';
+import { IOrderAsFindByConfirmationNumberResult } from '../../chevreAsset/order/factory';
+import { IFindParams, IOrderAsSearchResult, IOrderAsSearchWithUnwindAcceptedOffersResult, IReturner, IUpdateChangeableAttributesParams } from '../../chevreConsole/order/factory';
 /**
  * 注文管理サービス
  */
@@ -18,17 +18,7 @@ export declare class OrderService extends Service {
     /**
      * 注文を検索する
      */
-    search(params: Omit<factory.order.ISearchConditions, 'project' | 'provider'> & Pick<ISearchOrdersOptions, '$unwindAcceptedOffers'> & {
-        /**
-         * min: 1
-         * max: 20
-         */
-        limit: number;
-        /**
-         * min: 1
-         */
-        page: number;
-    }): Promise<ISearchResult<IOrderAsSearchWithUnwindAcceptedOffersResult[] | Omit<IOrderAsSearchResult, 'identifier' | 'url' | 'additionalProperty'>[]>>;
+    findOrders(params: Pick<IFindParams, '$unwindAcceptedOffers' | 'acceptedOffers' | 'confirmationNumbers' | 'customer' | 'name' | 'orderDate' | 'orderNumbers' | 'orderStatuses' | 'paymentMethods' | 'limit' | 'page' | 'sort'>): Promise<IOrderAsSearchWithUnwindAcceptedOffersResult[] | IOrderAsSearchResult[]>;
     /**
      * 返品者検索
      */

package/lib/abstract/cloud/admin/order.js

@@ -26,7 +26,20 @@ class OrderService extends service_1.Service {
     /**
      * 注文を検索する
      */
-    async search(params) {
+    async findOrders(params
+    // & Pick<ISearchOrdersOptions, '$unwindAcceptedOffers'>
+    // & {
+    //     /**
+    //      * min: 1
+    //      * max: 20
+    //      */
+    //     limit: number;
+    //     /**
+    //      * min: 1
+    //      */
+    //     page: number;
+    // }
+    ) {
         const { auth, endpoint, project, seller } = this.options;
         const chevreAdmin = await (0, index_1.loadChevreAdmin)({ auth, endpoint });
         // const { project, ...validQueries } = req.query;
@@ -48,13 +61,12 @@ class OrderService extends service_1.Service {
             project,
             seller: { id: (typeof seller?.id === 'string') ? seller.id : '' }
         });
-        const { data } = await orderService.search({
+        return orderService.findOrders({
             ...params,
             limit,
             page
             // $projection: DEFAULT_PROJECTION
         });
-        return { data };
     }
     /**
      * 返品者検索

package/lib/abstract/cloud/admin/reservation.d.ts

@@ -4,7 +4,7 @@ import { Service } from '../../service';
 /**
  * 予約検索条件
  */
-type IFindParams = Pick<factory.reservation.eventReservation.ISearchConditions, 'typeOf' | 'bookingFrom' | 'bookingThrough' | 'ids' | 'reservationNumbers' | 'reservationStatuses'> & {
+type IFindParams = Pick<factory.reservation.eventReservation.ISearchConditions, 'bookingFrom' | 'bookingThrough' | 'ids' | 'reservationNumbers' | 'reservationStatuses'> & {
     underName?: {
         email?: {
             $regex?: string;
@@ -18,6 +18,7 @@ type IFindParams = Pick<factory.reservation.eventReservation.ISearchConditions,
         };
     };
     reservationFor?: Pick<factory.reservation.eventReservation.IReservationForSearchConditions, 'startFrom' | 'startThrough' | 'ids'> & {
+        id?: string;
         location?: {
             branchCodes?: string[];
         };

package/lib/abstract/cloud/admin/reservation.js

@@ -34,18 +34,18 @@ class ReservationService extends service_1.Service {
             project,
             seller: { id: (typeof seller?.id === 'string') ? seller.id : '' }
         });
-        return await reservationService.find({
+        return await reservationService.findReservations({
             ...params,
             limit,
             page,
-            // statusを明示的に制限(2023-05-29~)
-            reservationStatus: {
-                $in: [
-                    factory_1.factory.reservationStatusType.ReservationCancelled,
-                    factory_1.factory.reservationStatusType.ReservationConfirmed
-                ]
-            },
-            typeOf: factory_1.factory.reservationType.EventReservation
+            // // statusを明示的に制限(2023-05-29~)
+            // reservationStatus: {
+            //     $in: [
+            //         factory.reservationStatusType.ReservationCancelled,
+            //         factory.reservationStatusType.ReservationConfirmed
+            //     ]
+            // },
+            // typeOf: factory.reservationType.EventReservation
         });
     }
     /**

package/lib/abstract/cloud/search/product.js

@@ -7,9 +7,6 @@ const service_1 = require("../../service");
  * プロダクト(興行、アドオンなど)サービス
  */
 class ProductService extends service_1.Service {
-    // constructor(options: IAdditionalOptions & Pick<IOptions, 'auth' | 'endpoint' | 'transporter' | 'project' | 'defaultPath'>) {
-    //     super({ ...options, retryableStatusCodes: [BAD_GATEWAY, FORBIDDEN, UNAUTHORIZED] });
-    // }
     /**
      * プロダクトタイプ指定でプロダクトを検索する
      */