@chevre/factory 8.2.0-alpha.0 → 8.2.0-alpha.10

package/lib/chevre/action/accept/coaOffer.d.ts

@@ -1,11 +1,12 @@
 import type { COAFactory } from '@coasystems/factory';
 import { IParticipantAsWebApplication, IAction as IBaseAction } from '../../action';
 import { ActionType } from '../../actionType';
-import { IAcceptedTicketOfferItemOffered, IAcceptedTicketOfferWithoutDetail as IAcceptedOfferWithoutDetail4chevre } from '../../assetTransaction/reserve';
+import { IItemOfferedServiceOutput, IAcceptedTicketOfferItemOffered, IAcceptedTicketOfferWithoutDetail as IAcceptedOfferWithoutDetail4chevre } from '../../assetTransaction/reserve';
 import { AssetTransactionType } from '../../assetTransactionType';
 import { IOffer } from '../../offer';
 import { OfferType } from '../../offerType';
 import { ITicketPriceSpecification } from '../../order';
+import { IPropertyValue } from '../../propertyValue';
 import { IRecipe, IUpdTmpReserveSeatArgs, IUpdTmpReserveSeatResult } from '../../recipe/acceptCOAOffer';
 import { TransactionType } from '../../transactionType';
 import { IAttributes as IBaseAttributes } from '../accept';
@@ -166,7 +167,11 @@ export type IAcceptedOffer4COA = Pick<IAcceptedOfferWithoutDetail4chevre, 'id' |
      * 単価オファーコード
      */
     identifier: string;
-    itemOffered: IAcceptedTicketOfferItemOffered;
+    itemOffered: {
+        serviceOutput?: IItemOfferedServiceOutput & {
+            additionalProperty?: IPropertyValue<string>[];
+        };
+    };
     ticketInfo: ICOATicketInfoWithDetails;
     /**
      * COAイベントでは、priceSpecificationで価格を表現しきれないので、numberとしてのpriceが必要

package/lib/chevre/assetTransaction/reserve.d.ts

@@ -123,24 +123,17 @@ export type ITokenizedProgramMembershipUsed = string;
  */
 export type IAcceptedProgramMembershipUsed = IPermitIssuedThroughFaceToFace | IPermitIssuedThroughMembershipService | IProgramMembershipUsedAsTicket | ITokenizedProgramMembershipUsed;
 export type IAcceptedSubReservation = ISubReservation4eventReservation;
+/**
+ * 予約取引開始前の指定予約属性
+ */
 export interface IEventReservatonAsItemOfferedServiceOutput {
     typeOf: ReservationType.EventReservation;
-    /**
-     * 追加特性
-     */
-    additionalProperty?: IPropertyValue<string>[];
     /**
      * 予約追加テキスト
      */
     additionalTicketText?: string;
     programMembershipUsed?: IAcceptedProgramMembershipUsed;
     reservedTicket?: {
-        /**
-         * チケット識別子
-         * 指定された場合、決済カードの対象チケット識別子と関連付けされます
-         * /^[0-9a-zA-Z]{8,16}$/
-         */
-        identifier?: string;
         issuedBy?: Pick<ITicketIssuedBy, 'name' | 'typeOf'>;
         typeOf: TicketType;
         /**
@@ -152,14 +145,12 @@ export interface IEventReservatonAsItemOfferedServiceOutput {
 }
 export type IItemOfferedServiceOutput = IEventReservatonAsItemOfferedServiceOutput;
 /**
- * 受け入れられたオファーのアイテム
+ * 予約取引開始前の指定オファーのアイテム
  */
 export interface IAcceptedTicketOfferItemOffered {
-    pointAward?: never;
     serviceOutput?: IItemOfferedServiceOutput;
 }
 export interface IAcceptedTicketOfferItemOffered4object {
-    pointAward?: never;
     serviceOutput: {
         id: string;
     };
@@ -209,7 +200,7 @@ export type IMultipleAcceptedAppliesToMovieTicket = {
  */
 export type IAcceptedAppliesToMovieTicket = ISingleAcceptedAppliesToMovieTicket | IMultipleAcceptedAppliesToMovieTicket;
 /**
- * 受け入れられたチケットオファー(詳細なし)
+ * 予約取引開始前の指定チケットオファー(詳細なし)
  */
 export interface IAcceptedTicketOfferWithoutDetail {
     /**
@@ -327,6 +318,9 @@ export interface IEventOfferTokenPayload {
  * トークンの中身については @see IEventOfferTokenPayload
  */
 export type IEventOfferToken = string;
+/**
+ * 予約取引開始前の指定オブジェクト
+ */
 export interface IObjectWithoutDetail {
     acceptedOffer?: IAcceptedTicketOfferWithoutDetail[];
     broker?: IBroker;
@@ -360,11 +354,12 @@ export type IMovieTicketTypeChargePriceComponent = Pick<IMovieTicketTypeChargeSp
 export type IUnitPriceComponent = Pick<IUnitPriceOfferPriceSpecification, 'accounting' | 'appliesToMovieTicket' | 'appliesToAddOn' | 'name' | 'price' | 'priceCurrency' | 'referenceQuantity' | 'typeOf' | 'valueAddedTaxIncluded'>;
 export type ITicketPriceComponent = ICategoryChargePriceComponent | IMovieTicketTypeChargePriceComponent | IUnitPriceComponent;
 export type IPrice = Pick<ICompoundPriceSpecification<ITicketPriceComponent>, 'priceComponent' | 'priceCurrency' | 'typeOf' | 'valueAddedTaxIncluded'>;
-export type IEventReservationAsSubReservation = Pick<IEventReservation, 'additionalProperty' | 'additionalTicketText' | 'id' | 'programMembershipUsed' | 'subReservation' | 'typeOf'> & {
+export type IEventReservationAsSubReservation = Pick<IEventReservation, 'additionalTicketText' | 'id' | 'programMembershipUsed' | 'subReservation' | 'typeOf'> & {
     numSeats?: number;
     price?: IPrice;
     priceCurrency?: PriceCurrency;
     reservedTicket: ISubReservationReservedTicket;
+    additionalProperty?: never;
 };
 export type IObjectSubReservation = IEventReservationAsSubReservation;
 export type IServiceTypeOfIssuedThrough = Pick<IServiceType, 'codeValue' | 'inCodeSet' | 'typeOf'>;

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

@@ -1,5 +1,5 @@
 import { IAction as IReturnOrderAction } from '../action/transfer/return/order';
-import { IAcceptedOffer, IOrder } from '../order';
+import { IAcceptedOffer, IOrder, ITicketPriceSpecification } from '../order';
 import { OrderStatus } from '../orderStatus';
 /**
  * 返品通知
@@ -19,7 +19,12 @@ export type IProcessingOrder4inform = Pick<IOrder, 'project' | 'typeOf' | 'selle
  * 配送中通知
  */
 export type IInTransitOrder4inform = Pick<IOrder, 'project' | 'typeOf' | 'orderNumber'> & {
-    acceptedOffers: IAcceptedOffer[];
+    acceptedOffers: (Omit<IAcceptedOffer, 'priceSpecification'> & {
+        /**
+         * COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
+         */
+        priceSpecification?: ITicketPriceSpecification;
+    })[];
     id?: string;
     orderStatus: OrderStatus.OrderInTransit;
 };

package/lib/chevre/order.d.ts

@@ -23,6 +23,7 @@ import { IReservation as IRawReservation, IReservedTicket as IRawReservedTicket
 import { ReservationType } from './reservationType';
 import { ISeller as IBaseSeller } from './seller';
 import { IPaymentMethodAsServiceOutput, PaymentServiceType } from './service/paymentService';
+import { IService, Identifier } from './service/webAPI';
 import { SortType } from './sortType';
 import { UnitCode } from './unitCode';
 export { OrderType };
@@ -199,10 +200,11 @@ export type IEventReservation = Pick<IRawReservation, 'additionalProperty' | 'ad
 /**
  * COAの場合の予約
  */
-export type ICOAEventReservation = Pick<IRawReservation, 'additionalProperty' | 'additionalTicketText' | 'id' | 'programMembershipUsed' | 'reservationNumber' | 'typeOf'> & {
+export type ICOAEventReservation = Pick<IRawReservation, 'additionalTicketText' | 'id' | 'programMembershipUsed' | 'reservationNumber' | 'typeOf'> & {
     issuedThrough: ICOAIssuedThrough;
     reservationFor: ICOAEventAsReservationFor;
     reservedTicket: ICOAReservedTicket;
+    additionalProperty?: IPropertyValue<string>[];
 };
 /**
  * オファー提供アイテムとしての予約
@@ -221,20 +223,40 @@ export type ITicketPriceComponent = ICategoryChargePriceComponent | IMovieTicket
  */
 export type ITicketPriceSpecification = Pick<ICompoundPriceSpecification<ITicketPriceComponent>, 'priceComponent' | 'priceCurrency' | 'typeOf' | 'valueAddedTaxIncluded'>;
 export type IOfferOptimized4acceptedOffer = Pick<IOffer, 'typeOf' | 'id' | 'itemOffered' | 'offeredThrough' | 'name'>;
-/**
- * 受け入れオファー
- */
-export interface IAcceptedOffer extends IOfferOptimized4acceptedOffer {
+export interface ICOAAcceptedOffer extends IOfferOptimized4acceptedOffer {
+    /**
+     * オファー対象アイテム
+     */
+    itemOffered: ICOAEventReservation;
+    offeredThrough: Pick<IService<Identifier>, 'typeOf'> & {
+        identifier: Identifier.COA;
+    };
+    priceSpecification?: ITicketPriceSpecification;
+    /**
+     * 資産取引番号
+     * 2024-01-30~
+     */
+    serialNumber: string;
+}
+export interface IOptimizedAcceptedOffer extends IOfferOptimized4acceptedOffer {
     /**
      * オファー対象アイテム
      */
-    itemOffered: IItemOffered;
+    itemOffered: IEventReservation;
+    offeredThrough: Pick<IService<Identifier>, 'typeOf'> & {
+        identifier: Identifier.Chevre;
+    };
     priceSpecification?: ITicketPriceSpecification;
     /**
-     * 資産取引を特定する番号(2024-01-30~)
+     * 資産取引番号
+     * 2024-01-30~
      */
-    serialNumber?: string;
+    serialNumber: string;
 }
+/**
+ * 受け入れオファー
+ */
+export type IAcceptedOffer = ICOAAcceptedOffer | IOptimizedAcceptedOffer;
 /**
  * 販売者
  */
@@ -511,14 +533,7 @@ export interface IAcceptedOffersSearchConditions {
          * 予約番号
          */
         reservationNumbers?: string[];
-        reservedTicket?: {
-            /**
-             * 予約チケット識別子
-             */
-            identifier?: {
-                $eq?: string;
-            };
-        };
+        reservedTicket?: never;
     };
     serialNumber?: {
         $eq?: string;
@@ -597,7 +612,7 @@ export interface ISearchConditions {
      */
     paymentMethods?: IPaymentMethodsSearchConditions;
     /**
-     * 注文アイテム条件
+     * 注文オファー条件
      */
     acceptedOffers?: IAcceptedOffersSearchConditions;
 }

package/lib/chevre/paymentMethod/paymentCard/movieTicket.d.ts

@@ -16,11 +16,14 @@ export interface IMovieTicketServiceOutput {
     reservedTicket: {
         /**
          * チケット識別子
-         * 指定された場合、予約のチケット識別子と関連付けされます
-         * /^[0-9a-zA-Z]{8,16}$/
+         * 予約のチケット識別子と関連付けされる
+         * 指定は不可
          */
         identifier?: string;
-        ticketedSeat: ISeat;
+        /**
+         * 決済カードと関連付ける座席
+         */
+        ticketedSeat: Pick<ISeat, 'seatNumber' | 'seatRow' | 'seatSection' | 'typeOf'>;
     };
 }
 /**

package/lib/chevre/place/movieTheater.d.ts

@@ -27,24 +27,12 @@ export interface IOffer extends Pick<IBaseOffer, 'typeOf' | 'eligibleQuantity'>
      * イベント開始後の販売猶予期間
      */
     availabilityEndsGraceTime: IAvailabilityEndsGraceTime;
-    /**
-     * イベント開始前の販売猶予期間(POS)
-     */
-    availabilityStartsGraceTimeOnPOS?: never;
-    /**
-     * イベント開始後の販売猶予期間(POS)
-     */
-    availabilityEndsGraceTimeOnPOS?: never;
 }
 /**
  * 施設の操作するPoints-of-Sales
  */
 export interface IPOS {
-    /**
-     * コード
-     * @deprecated Use branchCode(2023-09-27~)
-     */
-    id: string;
+    id?: never;
     /**
      * コード
      */
@@ -67,10 +55,6 @@ export type IParentOrganization = Pick<ISeller, 'typeOf' | 'id'> & {
 export interface IPlace extends Pick<IBasePlace, 'additionalProperty' | 'branchCode' | 'name' | 'project' | 'telephone' | 'typeOf' | 'url'> {
     typeOf: PlaceType.MovieTheater;
     id: string;
-    /**
-     * ルーム数
-     */
-    screenCount?: number;
     /**
      * 施設コード
      */

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

@@ -75,7 +75,7 @@ export interface IReservation extends IBaseReservation {
     numSeats?: never;
 }
 export interface IReservationForSearchConditions {
-    typeOf?: EventType;
+    typeOf?: never;
     id?: string | {
         $eq?: string;
     };
@@ -145,11 +145,11 @@ export interface IReservedTicketSearchConditions {
 }
 export interface IStringSearchConditions {
     $eq?: string;
-    $ne?: string;
     $in?: string[];
-    $nin?: string[];
-    $options?: string;
     $regex?: string;
+    $ne?: never;
+    $nin?: never;
+    $options?: never;
 }
 /**
  * ソート条件
@@ -207,8 +207,6 @@ export interface ISearchConditions {
     reservationStatuses?: IAvailableReservationStatusType[];
     bookingFrom?: Date;
     bookingThrough?: Date;
-    modifiedFrom?: Date;
-    modifiedThrough?: Date;
     /**
      * 予約チケット
      */

package/lib/chevre/reservation/pendingReservationPackage.js

@@ -1,14 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// public async lockIfNotLimitExceeded
-// reservationCount<=nであれば$push+$incする
-// public async lock
-// [reservationFor.id+seatNumber+seatSection][reservationNumber][subReservation.id]にunique indexを作成した上で$push+$incする
-// public async unlock
-// [id]あるいは[seatNumber+seatSection]でreservations.subReservationsから$pull+$incする
-// public async countUnavailableOffers
-// reservationCountを返す
-// public async getHolder
-// [id]あるいは[seatNumber+seatSection]でreservationNumberを返す
-// public async searchHolders
-// [id]あるいは[seatNumber+seatSection]のリストでreservationNumberのリストを返す

package/lib/chevre/reservation.d.ts

@@ -79,7 +79,7 @@ export interface ITicket {
     /**
      * チケット識別子
      */
-    identifier?: string;
+    identifier: string;
     /**
      * The organization issuing the ticket or permit.
      */
@@ -199,5 +199,5 @@ export interface IReservation {
      * 出席(入場)済かどうか
      */
     attended?: boolean;
-    additionalProperty?: IPropertyValue<string>[];
+    additionalProperty?: never;
 }

package/lib/chevre/serviceChannel.d.ts

@@ -4,12 +4,28 @@ import { SortType } from './sortType';
 export interface ICredentialsCreditCard {
     siteId: string;
     sitePass: string;
+    /**
+     * CreditCardIFでは決済承認レート制限はなし
+     */
+    rateLimit?: never;
 }
 export interface ICredentialsMovieTicket {
     authorizeServerDomain: string;
     clientId: string;
     clientSecret: string;
+    /**
+     * 着券取消IFを使用するかどうか
+     * add(2024-04-27~)
+     */
     useSeatInfoSyncCancel?: boolean;
+    /**
+     * 決済承認レート制限(paymentServiceのIDごと)設定
+     * 2026-05-27~
+     */
+    rateLimit?: {
+        threshold: number;
+        unitInSeconds: number;
+    };
 }
 export interface IServiceChannelCreditCard {
     credentials: ICredentialsCreditCard;

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

@@ -1,9 +1,8 @@
-import type { passport } from '@waiter/factory';
 import { IAttributes as ISendEmailMessageActionAttributes } from '../action/transfer/send/message/email';
 import { IExtendId } from '../autoGenerated';
 import { IClientUser } from '../clientUser';
 import { CreativeWorkType } from '../creativeWorkType';
-import { ICustomer as IOrderCustomer, IBroker, IIdentifier as IOrderIdentifier, ISeller as IOrderSeller, IOrder } from '../order';
+import { ICustomer as IOrderCustomer, IBroker, ISeller as IOrderSeller, IOrder } from '../order';
 import { IProject } from '../project';
 import { IAgent as IBaseAgent, IPassportBeforeStart, ISeller as IBaseSeller, ISearchConditions as IBaseSearchConditions, ISendEmailMessageParams, IStartParams as IBaseStartParams, IAttributes as IBaseAttributes } from '../transaction';
 import { TransactionType } from '../transactionType';
@@ -19,7 +18,7 @@ export type IAgent = IBaseAgent & {
      * 外部メンバーシップトークン
      */
     memberOfToken?: string;
-    memberOfPayload?: IMemberOfPayload;
+    memberOfPayload?: never;
 };
 export type ICustomerInObject = Pick<IOrderCustomer, 'id' | 'identifier' | 'typeOf'>;
 export interface IPaymentMethodByPaymentUrl {
@@ -30,10 +29,12 @@ export interface IPaymentMethodByPaymentUrl {
     paymentMethodId: string;
 }
 export interface IObject {
-    clientUser?: Omit<IClientUser, 'scope' | 'scopes'>;
     broker?: Pick<IBroker, 'id' | 'typeOf'>;
     customer?: ICustomerInObject;
-    identifier?: IOrderIdentifier;
+    /**
+     * passportによって決定するカスタマータイプ
+     */
+    customerType?: string;
     /**
      * 確認番号
      */
@@ -42,19 +43,16 @@ export interface IObject {
      * 注文番号
      */
     orderNumber?: string;
-    /**
-     * 注文名称
-     */
-    name?: string;
     /**
      * 決済URLでの決済情報
      */
     paymentMethods?: IPaymentMethodByPaymentUrl;
-    /**
-     * WAITER許可証
-     */
-    passport?: passport.IPassport;
+    name?: never;
+    identifier?: never;
+    clientUser?: never;
+    passport?: never;
 }
+export type IClientUserBeforeStart = Pick<IClientUser, 'aud' | 'client_id' | 'exp' | 'iat' | 'iss' | 'jti' | 'sub' | 'token_use' | 'username'>;
 export interface IStartParamsWithoutDetail {
     project: Pick<IProject, 'id' | 'typeOf'>;
     agent: IAgent;
@@ -62,13 +60,10 @@ export interface IStartParamsWithoutDetail {
         id: string;
     };
     object: {
-        clientUser?: Omit<IClientUser, 'scope' | 'scopes'>;
+        clientUser?: IClientUserBeforeStart;
         customer?: ICustomerInObject;
         passport?: IPassportBeforeStart;
-        /**
-         * 注文名称
-         */
-        name?: string;
+        name?: never;
     };
 }
 export type ISeller = IBaseSeller & Pick<IOrderSeller, 'additionalProperty'>;
@@ -108,14 +103,8 @@ export interface IPotentialActionsParams {
  * 取引結果の注文パラメータ
  */
 export interface IResultOrderParams {
-    /**
-     * 注文識別子指定
-     */
-    identifier?: IOrderIdentifier;
-    /**
-     * 注文確認URLのカスタム指定
-     */
-    url?: string;
+    identifier?: never;
+    url?: never;
 }
 /**
  * 取引結果パラメータ
@@ -143,7 +132,10 @@ export interface IConfirmParams {
      */
     result?: IResultParams;
 }
-export type IOrderAsResult = Pick<IOrder, 'confirmationNumber' | 'identifier' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'price' | 'priceCurrency' | 'typeOf' | 'url'>;
+export type IOrderAsResult = Pick<IOrder, 'confirmationNumber' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'price' | 'priceCurrency' | 'typeOf'> & {
+    identifier?: never;
+    url?: never;
+};
 export interface IAuthorizeActionAsResult {
     id: string;
 }

package/lib/chevre/unitPriceOffer.d.ts

@@ -17,10 +17,6 @@ export { IOfferMerchantReturnPolicy, IOfferMerchantReturnPolicySearchConditions,
 export interface IItemOffered {
     typeOf: ProductType;
     serviceOutput?: never;
-    /**
-     * 特典
-     */
-    pointAward?: never;
 }
 /**
  * 単価オファーの価格仕様

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chevre/factory",
-  "version": "8.2.0-alpha.0",
+  "version": "8.2.0-alpha.10",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "files": [