Merge branch 'release/4.257.0'

chevre-jp · Aug 1, 2022 · da319ab · da319ab
2 parents 2daf76b + 14a553c
commit da319ab
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ### Security
 
+## v4.257.0 - 2022-08-02
+
+### Changed
+
+- イベントオファー承認アクションのobject.acceptedOfferを最適化
+
 ## v4.256.0 - 2022-07-29
 
 ### Changed

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chevre/factory",
-  "version": "4.256.0",
+  "version": "4.257.0",
   "description": "Chevre Factory Library for Javascript",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",

diff --git a/src/factory/action/authorize/offer/seatReservation.ts b/src/factory/action/authorize/offer/seatReservation.ts
@@ -63,7 +63,32 @@ export interface IResult<T extends WebAPIFactory.Identifier> {
     acceptedOffers?: IResultAcceptedOffer[];
 }
 
-export type IAcceptedOffer4chevre = ReserveTransactionFactory.IAcceptedTicketOffer;
+export type IAcceptedOfferPriceSpecification =
+    ScreeningEventFactory.ITicketPriceSpecification
+    & {
+        /**
+         * 複合価格仕様に、指定された適用決済カード情報を付加できるように
+         */
+        appliesToMovieTicket?: ReserveTransactionFactory.IAcceptedAppliesToMovieTicket;
+    };
+/**
+ * 受け入れられたチケットオファー
+ */
+export type IAcceptedOffer4chevre =
+    // Pick<ReserveTransactionFactory.IAcceptedTicketOfferWithoutDetail, 'id' | 'addOn' | 'additionalProperty' | 'paymentMethod'>
+    // itemOffered ?: IAcceptedTicketOfferItemOffered;
+    Pick<
+        ScreeningEventFactory.ITicketOffer,
+        // 最適化(2022-08-02~)
+        'id' | 'identifier' | 'typeOf' | 'priceCurrency' | 'itemOffered' | 'addOn' | 'additionalProperty'
+    >
+    & Pick<ReserveTransactionFactory.IAcceptedTicketOfferWithoutDetail, 'id' | 'addOn' | 'additionalProperty' | 'paymentMethod'>
+    & {
+        itemOffered?: ReserveTransactionFactory.IAcceptedTicketOfferItemOffered;
+        priceSpecification: IAcceptedOfferPriceSpecification;
+        movieTicketIdentifire?: string;
+    };
+// export type IAcceptedOffer4chevre = ReserveTransactionFactory.IAcceptedTicketOffer;
 
 export type IAcceptedOfferWithoutDetail4chevre = ReserveTransactionFactory.IAcceptedTicketOfferWithoutDetail;
 

diff --git a/src/factory/assetTransaction/reserve.ts b/src/factory/assetTransaction/reserve.ts
@@ -3,7 +3,6 @@ import { ActionType } from '../actionType';
 import * as AssetTransactionFactory from '../assetTransaction';
 import { AssetTransactionType } from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
-import { ITicketOffer } from '../event/screeningEvent';
 import { IMovieTicket } from '../paymentMethod/paymentCard/movieTicket';
 import { IPointAward } from '../product';
 import { IPropertyValue } from '../propertyValue';
@@ -18,12 +17,6 @@ import { ReservationType } from '../reservationType';
 
 // 最適化(2022-05-27~)
 export import IAgent = AssetTransactionFactory.IAgent;
-// export interface IAgent {
-//     typeOf: ReservationFactory.IUnderNameType;
-//     id?: string;
-//     name: string;
-//     url?: string;
-// }
 export type IStartParamsWithoutDetail =
     AssetTransactionFactory.IStartParams<AssetTransactionType.Reserve, IAgent, undefined, IObjectWithoutDetail>;
 /**
@@ -166,11 +159,11 @@ export interface IAcceptedTicketOfferWithoutDetail {
 /**
  * 受け入れられたチケットオファー
  */
-export type IAcceptedTicketOffer = Omit<IAcceptedTicketOfferWithoutDetail, 'priceSpecification'>
-    & ITicketOffer
-    & {
-        itemOffered?: IAcceptedTicketOfferItemOffered;
-    };
+// export type IAcceptedTicketOffer = Omit<IAcceptedTicketOfferWithoutDetail, 'priceSpecification'>
+//     & ITicketOffer
+//     & {
+//         itemOffered?: IAcceptedTicketOfferItemOffered;
+//     };
 export interface IAcceptedOffer4object {
     id: string;
     itemOffered: IAcceptedTicketOfferItemOffered4object;
@@ -184,25 +177,13 @@ export interface IAcceptedOffer4object {
  */
 export interface IConfirmingReservation {
     id: string;
-    /**
-     * Any additional text to appear on a ticket, such as additional privileges or identifiers.
-     */
-    // additionalTicketText?: string;
     reservedTicket?: {
         /**
          * チケット発行者
          */
         issuedBy?: ReservationFactory.IUnderName;
-        /**
-         * If the barcode image is hosted on your site, the value of the field is URL of the image, or a barcode or QR URI,
-         * such as "barcode128:AB34" (ISO-15417 barcodes), "qrCode:AB34" (QR codes),
-         * "aztecCode:AB34" (Aztec codes), "barcodeEAN:1234" (EAN codes) and "barcodeUPCA:1234" (UPCA codes).
-         */
-        // ticketToken?: string;
-        // underName?: ReservationFactory.IUnderName;
     };
     underName?: ReservationFactory.IUnderName;
-    // additionalProperty?: IPropertyValue<string>[];
 }
 export interface IPotentialActionsParams {
     reserve?: {
@@ -238,12 +219,6 @@ export interface IObjectWithoutDetail {
 }
 // IReservationForを最適化
 export type IReservationFor = IEventReservationReservationFor;
-// export interface IEventReservationWithAnyReservationFor extends IEventReservation {
-//     reservationFor: any;
-// }
-// export interface ISubReservation extends IEventReservationWithAnyReservationFor {
-//     reservationFor: undefined;
-// }
 // 取引のsubReservationからはreservationForを削除する
 export type IObjectSubReservation = Omit<IEventReservation, 'reservationFor'>;
 /**