予約に識別子を拡張

決済カードに予約識別子を拡張
chevre-jp · Apr 13, 2024 · 380b1c0 · 380b1c0
1 parent 1e56631
commit 380b1c0
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ### Changed
 
 - 注文のadditionalPropertyを廃止
+- 予約に識別子を拡張
+- 決済カードに予約識別子を拡張
 
 ### Deprecated
 

diff --git a/src/action/check/paymentMethod/movieTicket.ts b/src/action/check/paymentMethod/movieTicket.ts
@@ -2,7 +2,7 @@ import type * as surfrock from '@surfrock/sdk';
 
 import * as ActionFactory from '../../../action';
 import { OrganizationType } from '../../../organizationType';
-import { IMovieTicket as IMovieTicketPaymentCard, IServiceOutput as IMovieTicketServiceOutput } from '../../../paymentMethod/paymentCard/movieTicket';
+import { IMovieTicketPaymentCard, IMovieTicketServiceOutput } from '../../../paymentMethod/paymentCard/movieTicket';
 import { TransactionType } from '../../../transactionType';
 import * as CheckActionFactory from '../../check';
 import * as PayActionFactory from '../../trade/pay';

diff --git a/src/action/trade/pay.ts b/src/action/trade/pay.ts
@@ -8,7 +8,7 @@ import { AssetTransactionType } from '../../assetTransactionType';
 import { CreativeWorkType } from '../../creativeWorkType';
 import { IPaymentServiceOutput } from '../../invoice';
 import { ITotalPaymentDue, OrderType } from '../../order';
-import { IMovieTicket as IMovieTicketPaymentCard } from '../../paymentMethod/paymentCard/movieTicket';
+import { IMovieTicketPaymentCard } from '../../paymentMethod/paymentCard/movieTicket';
 import { IPropertyValue } from '../../propertyValue';
 import { PaymentServiceType } from '../../service/paymentService';
 import { IAttributes as IInformActionAttributes } from '../interact/inform';

diff --git a/src/index.ts b/src/index.ts
@@ -408,7 +408,7 @@ export import ownershipInfo = OwnershipInfoFactory;
 
 export namespace paymentMethod {
     export type ISearchConditions = any;
-    export type IPaymentMethod = CreditCardFactory.ICheckedCard | MovieTicketFactory.IMovieTicket;
+    export type IPaymentMethod = CreditCardFactory.ICheckedCard | MovieTicketFactory.IMovieTicketPaymentCard;
 
     export namespace paymentCard {
         export import IPaymentCard = PaymentCardFactory.IPaymentCard;

diff --git a/src/order.ts b/src/order.ts
@@ -156,8 +156,8 @@ export type IBusReservation = Pick<
     BusReservationFactory.IReservation,
     'additionalProperty' |
     'additionalTicketText' |
-    // 'bookingTime' |
     'id' |
+    'identifier' | // 追加(2024-04-15~)
     'issuedThrough' |
     'programMembershipUsed' |
     'reservationNumber' |
@@ -170,8 +170,8 @@ export type IEventReservation = Pick<
     EventReservationFactory.IReservation,
     'additionalProperty' |
     'additionalTicketText' |
-    // 'bookingTime' |
     'id' |
+    'identifier' | // 追加(2024-04-15~)
     'issuedThrough' |
     'programMembershipUsed' |
     'reservationNumber' |

diff --git a/src/paymentMethod/paymentCard/movieTicket.ts b/src/paymentMethod/paymentCard/movieTicket.ts
@@ -2,18 +2,39 @@ import { EventType } from '../../eventType';
 import { ISeat } from '../../reservation';
 import { IPaymentCard } from '../paymentCard';
 
-export interface IReservationFor { typeOf: EventType.ScreeningEvent; id: string; }
-export interface IServiceOutput {
+export interface IMovieTicketReservationFor { typeOf: EventType.ScreeningEvent; id: string; }
+export interface IMovieTicketServiceOutput {
+    /**
+     * 予約識別子
+     */
+    identifier?: string; // 追加(2024-04-15~)
     /**
      * 予約対象イベント
      */
-    reservationFor: IReservationFor;
+    reservationFor: IMovieTicketReservationFor;
     /**
      * 予約チケット
      */
     reservedTicket: { ticketedSeat: ISeat };
 }
-export interface IAttributes extends IPaymentCard {
+/**
+ * 決済カード
+ */
+export interface IMovieTicketPaymentCard extends Pick<
+    IPaymentCard,
+    'accessCode' | 'amount' | 'serviceOutput' | 'serviceType' | 'identifier' | 'typeOf'
+> {
+    /**
+     * 決済方法区分コード
+     */
+    typeOf: string;
+    category: {
+        /**
+         * 前売券（カード）の種類
+         * 全国券,劇場券など
+         */
+        codeValue: string; // 追加(2023-02-08~)
+    };
     /**
      * 購入管理番号
      */
@@ -29,22 +50,5 @@ export interface IAttributes extends IPaymentCard {
     /**
      * 利用対象予約
      */
-    serviceOutput: IServiceOutput;
-}
-
-/**
- * MovieTicket決済カード
- */
-export interface IMovieTicket extends IAttributes {
-    /**
-     * 決済方法区分コード
-     */
-    typeOf: string;
-    category: {
-        /**
-         * 前売券（カード）の種類
-         * 全国券,劇場券など
-         */
-        codeValue: string; // 追加(2023-02-08~)
-    };
+    serviceOutput: IMovieTicketServiceOutput;
 }
diff --git a/src/reservation/busReservation.ts b/src/reservation/busReservation.ts
@@ -28,6 +28,10 @@ export interface IIssuedThrough extends ReservationFactory.IIssuedThrough {
 export interface IReservation extends ReservationFactory.IReservation<IPriceSpecification> {
     bookingTime: Date;
     id: string;
+    /**
+     * 予約識別子
+     */
+    identifier?: string; // 追加(2024-04-15~)
     issuedThrough: IIssuedThrough;
     reservationFor: IReservationFor;
     reservationNumber: string;

diff --git a/src/reservation/event.ts b/src/reservation/event.ts
@@ -73,6 +73,10 @@ export interface IIssuedThrough extends ReservationFactory.IIssuedThrough {
 export interface IReservation extends ReservationFactory.IReservation<IPriceSpecification> {
     bookingTime: Date;
     id: string;
+    /**
+     * 予約識別子
+     */
+    identifier?: string; // 追加(2024-04-15~)
     issuedThrough: IIssuedThrough;
     reservationFor: IReservationFor;
     reservationNumber: string;