@cinerino/sdk 16.3.0-alpha.0 → 16.3.0-alpha.2

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

@@ -1,4 +1,4 @@
-import { IAcceptedOffer, IOrderAsSearchResult, IOrderAsFindAcceptedOffersResult, IReturner, IFindParams, IProjection, IUpdateChangeableAttributesParams } from '../chevreConsole/order/factory';
+import { IOrderAsSearchResult, IOrderAsFindAcceptedOffersResult, IReturner, IFindParams, IFindAcceptedOffersParams, IProjection, IUpdateChangeableAttributesParams } from '../chevreConsole/order/factory';
 import { factory } from '../factory';
 import { Service } from '../service';
 /**
@@ -12,7 +12,11 @@ export declare class OrderService extends Service {
     /**
      * 注文を検索する
      */
-    findOrders(params: IFindParams): Promise<IOrderAsSearchResult[] | IOrderAsFindAcceptedOffersResult[]>;
+    findOrders(params: IFindParams): Promise<IOrderAsSearchResult[]>;
+    /**
+     * 注文オファーを検索する
+     */
+    findOrderAcceptedOffers(params: IFindAcceptedOffersParams): Promise<IOrderAsFindAcceptedOffersResult[]>;
     /**
      * 注文取得
      */
@@ -45,5 +49,5 @@ export declare class OrderService extends Service {
     }, conditions: {
         limit?: number;
         page?: number;
-    }): Promise<IAcceptedOffer[]>;
+    }): Promise<factory.order.IAcceptedOffer[]>;
 }

package/lib/abstract/chevreAdmin/order.js

@@ -31,6 +31,21 @@ class OrderService extends service_1.Service {
         })
             .then(async (response) => response.json());
     }
+    /**
+     * 注文オファーを検索する
+     */
+    async findOrderAcceptedOffers(params) {
+        return this.fetch({
+            uri: '/orders',
+            method: 'GET',
+            qs: {
+                ...params,
+                $unwindAcceptedOffers: '1'
+            },
+            expectedStatusCodes: [http_status_1.status.OK]
+        })
+            .then(async (response) => response.json());
+    }
     /**
      * 注文取得
      */

package/lib/abstract/chevreAdmin/reservation.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../factory';
-import { ITicket, IUseAction } from '../chevreConsole/reservation/factory';
+import { ITicket, IUseAction, IReservationAsFindResult } from '../chevreConsole/reservation/factory';
 import { Service } from '../service';
 export interface IUseActionResult {
     id: string;
@@ -64,7 +64,7 @@ export declare class ReservationService extends Service {
          * min: 1
          */
         page: number;
-    }): Promise<factory.reservation.eventReservation.IReservation[]>;
+    }): Promise<IReservationAsFindResult[]>;
     /**
      * 予約を使用する(入場する)
      */

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

@@ -9,12 +9,6 @@ export interface IAuthorizeResult {
      */
     code: string;
 }
-export interface ISearchOrdersOptions {
-    /**
-     * オファーを展開するかどうか
-     */
-    $unwindAcceptedOffers?: '1';
-}
 /**
  * 確認番号による照会結果としての注文
  */

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

@@ -14,19 +14,13 @@ export type IOrderAsFindAcceptedOffersResult = Pick<factory.order.IOrder, 'order
  * オファー展開しない検索結果としての注文
  */
 export type IOrderAsSearchResult = Pick<factory.order.IOrder, 'broker' | 'confirmationNumber' | 'customer' | 'dateReturned' | 'id' | 'name' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'previousOrderStatus' | 'price' | 'priceCurrency' | 'seller'>;
-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
@@ -102,7 +96,10 @@ export type IFindParams = Pick<factory.order.ISearchConditions, 'confirmationNum
         };
     };
 };
-export type IAcceptedOffer = factory.order.IAcceptedOffer;
+/**
+ * 注文オファー検索条件
+ */
+export type IFindAcceptedOffersParams = Pick<IFindParams, 'limit' | 'orderNumbers' | 'page' | 'sort'>;
 export type IReturner = Pick<factory.iam.IMemberOfRole, 'typeOf' | 'id' | 'name'>;
 export interface IUpdateChangeableAttributesParams {
     confirmationNumber: string;

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

@@ -18,4 +18,8 @@ interface ITicketAsCode {
  * 予約使用チケット
  */
 export type ITicket = ITicketAsCode;
+/**
+ * 予約検索結果としての予約
+ */
+export type IReservationAsFindResult = Pick<factory.reservation.eventReservation.IReservation, 'additionalTicketText' | 'attended' | 'bookingTime' | 'checkedIn' | 'id' | 'reservationFor' | 'reservationNumber' | 'reservationStatus' | 'reservedTicket'>;
 export {};

package/lib/abstract/chevreConsole/reservation/factory.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// export type ITicket = ITicketAsJWT | ITicketAsCode;

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

@@ -1,7 +1,7 @@
 import { factory } from '../../factory';
 import { Service } from '../../service';
 import { IOrderAsFindByConfirmationNumberResult } from '../../chevreAsset/order/factory';
-import { IFindParams, IOrderAsSearchResult, IOrderAsFindAcceptedOffersResult, IReturner, IUpdateChangeableAttributesParams } from '../../chevreConsole/order/factory';
+import { IFindParams, IFindAcceptedOffersParams, IOrderAsSearchResult, IOrderAsFindAcceptedOffersResult, IReturner, IUpdateChangeableAttributesParams } from '../../chevreConsole/order/factory';
 type IFindOrderParams = Pick<IFindParams, 'acceptedOffers' | 'confirmationNumbers' | 'customer' | 'name' | 'orderDate' | 'orderNumbers' | 'orderStatuses' | 'paymentMethods' | 'limit' | 'page' | 'sort'>;
 /**
  * 注文管理サービス
@@ -17,13 +17,13 @@ export declare class OrderService extends Service {
         orderNumber: string;
     }): Promise<IOrderAsFindByConfirmationNumberResult>;
     /**
-     * 注文を検索する
+     * 管理者による注文検索
      */
     findOrders(params: IFindOrderParams): Promise<IOrderAsSearchResult[]>;
     /**
-     * 展開された注文のオファーを検索する
+     * 管理者による注文オファー検索
      */
-    findOrderAcceptedOffers(params: IFindOrderParams): Promise<IOrderAsFindAcceptedOffersResult[]>;
+    findOrderAcceptedOffers(params: IFindAcceptedOffersParams): Promise<IOrderAsFindAcceptedOffersResult[]>;
     /**
      * 返品者検索
      */

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

@@ -24,7 +24,7 @@ class OrderService extends service_1.Service {
         });
     }
     /**
-     * 注文を検索する
+     * 管理者による注文検索
      */
     async findOrders(params) {
         const { auth, endpoint, project, seller } = this.options;
@@ -54,7 +54,7 @@ class OrderService extends service_1.Service {
         });
     }
     /**
-     * 展開された注文のオファーを検索する
+     * 管理者による注文オファー検索
      */
     async findOrderAcceptedOffers(params) {
         const { auth, endpoint, project, seller } = this.options;
@@ -77,9 +77,8 @@ class OrderService extends service_1.Service {
             project,
             seller: { id: (typeof seller?.id === 'string') ? seller.id : '' }
         });
-        return orderService.findOrders({
+        return orderService.findOrderAcceptedOffers({
             ...params,
-            $unwindAcceptedOffers: '1',
             limit,
             page
         });

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

@@ -1,4 +1,4 @@
-import { ITicket, IUseAction } from '../../chevreConsole/reservation/factory';
+import { ITicket, IUseAction, IReservationAsFindResult } from '../../chevreConsole/reservation/factory';
 import { factory } from '../../factory';
 import { Service } from '../../service';
 /**
@@ -35,10 +35,6 @@ type IFindParams = Pick<factory.reservation.eventReservation.ISearchConditions,
         };
     };
 };
-/**
- * 予約検索結果としての予約
- */
-type IReservationAsFindResult = Pick<factory.reservation.eventReservation.IReservation, 'additionalTicketText' | 'attended' | 'bookingTime' | 'checkedIn' | 'id' | 'reservationFor' | 'reservationNumber' | 'reservationStatus' | 'reservedTicket'>;
 /**
  * 予約サービス
  */