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

package/lib/action/authorize.d.ts

@@ -1,25 +1,13 @@
 import * as ActionFactory from '../action';
 import { ActionType } from '../actionType';
-/**
- * 承認対象インターフェース
- */
 export type IObject = any;
-/**
- * 承認結果インターフェース
- */
 export type IResult = any;
-/**
- * 承認目的インターフェース
- */
 export type IPurpose = any;
-/**
- * アクション属性インターフェース
- */
 export interface IAttributes<TObject, TResult> extends ActionFactory.IAttributes<ActionType.AuthorizeAction, TObject, TResult> {
-    purpose: IPurpose;
+    purpose?: IPurpose;
     recipient: ActionFactory.IParticipant;
 }
 /**
- * 承認アクションインターフェース
+ * 承認アクション
  */
 export type IAction<TAttributes extends IAttributes<IObject, IResult>> = ActionFactory.IAction<TAttributes>;

package/lib/action/check/paymentMethod/movieTicket.d.ts

@@ -1,7 +1,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';

package/lib/action/consume/use.d.ts

@@ -2,9 +2,7 @@ import * as ActionFactory from '../../action';
 import { ActionType } from '../../actionType';
 export type IObject = any;
 export type IResult = any;
-export type IPurpose = any;
-export interface IAttributes<TObject, TResult> extends ActionFactory.IAttributes<ActionType.UseAction, TObject, TResult> {
-    purpose?: IPurpose;
+export interface IAttributes<TObject, TResult> extends Pick<ActionFactory.IAttributes<ActionType.UseAction, TObject, TResult>, 'typeOf' | 'result' | 'project' | 'object' | 'location' | 'error' | 'instrument' | 'agent'> {
 }
 /**
  * 使用アクション

package/lib/action/trade/pay.d.ts

@@ -7,7 +7,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';

package/lib/assetTransaction/cancelReservation.d.ts

@@ -6,6 +6,7 @@ import { IExtendId } from '../autoGenerated';
 import { IClientUser } from '../clientUser';
 import { IReservation as IBusReservation, IReservationFor as IBusReservationFor } from '../reservation/busReservation';
 import { IReservation as IEventReservation, IReservationFor as IEventReservationFor } from '../reservation/event';
+import { IReservation as IReservationPackage } from '../reservation/reservationPackage';
 export import IAgent = AssetTransactionFactory.IAgent;
 export type IStartParamsWithoutDetail = AssetTransactionFactory.IStartParams<AssetTransactionType.CancelReservation, IAgent, undefined, IObjectWithoutDetail>;
 /**
@@ -22,11 +23,11 @@ export interface IObjectWithoutDetail {
     clientUser?: IClientUser;
     reservation?: {
         /**
-         * 予約IDをキーに取消
+         * 予約IDで取消
          */
         id?: string;
         /**
-         * 予約番号をキーに取消
+         * 予約番号で取消
          */
         reservationNumber?: string;
     };
@@ -45,10 +46,14 @@ export type IEventReservationAsObject = Pick<IEventReservation, 'id' | 'issuedTh
 /**
  * 取引対象物
  */
-export interface IObject {
+export interface IObject extends Pick<IReservationPackage, 'reservationNumber' | 'typeOf'> {
     clientUser?: IClientUser;
     transaction?: IReserveTransactionAsObject;
     reservations?: IBusReservationAsObject[] | IEventReservationAsObject[];
+    /**
+     * 予約番号
+     */
+    reservationNumber: string;
 }
 /**
  * 取引確定パラメータ
@@ -65,5 +70,12 @@ export type ITransaction = IExtendId<IAttributes>;
  */
 export interface IAttributes extends AssetTransactionFactory.IAttributes<IStartParams, IResult, IError, IPotentialActions> {
 }
+export interface IObjectSearchConditions {
+    reservationNumber?: {
+        $eq?: string;
+        $in?: string[];
+    };
+}
 export interface ISearchConditions extends AssetTransactionFactory.ISearchConditions<AssetTransactionType.CancelReservation> {
+    object?: IObjectSearchConditions;
 }

package/lib/assetTransaction/pay.d.ts

@@ -180,5 +180,11 @@ export interface ISearchConditions extends AssetTransactionFactory.ISearchCondit
         accountId?: {
             $eq?: string;
         };
+        /**
+         * 決済サービスタイプ
+         */
+        typeOf?: {
+            $eq?: string;
+        };
     };
 }

package/lib/assetTransaction/reserve.d.ts

@@ -71,12 +71,16 @@ export interface IBusReservatonAsItemOfferedServiceOutput {
     additionalTicketText?: string;
     programMembershipUsed?: IAcceptedProgramMembershipUsed;
     reservedTicket?: {
+        /**
+         * チケット識別子
+         * 指定された場合、決済カードの対象チケット識別子と関連付けされます
+         * /^[0-9a-zA-Z]{8,16}$/
+         */
+        identifier?: string;
         issuedBy?: ReservationFactory.IUnderName;
         typeOf: ReservationFactory.TicketType;
         /**
-         * 予約座席指定
-         * 指定席イベントの場合、座席を指定
-         * 自由席イベントの場合、あるいは、最大収容人数がないイベントの場合は、座席指定不要
+         * 座席指定
          */
         ticketedSeat?: ReservationFactory.ISeat;
     };
@@ -94,12 +98,16 @@ export interface IEventReservatonAsItemOfferedServiceOutput {
     additionalTicketText?: string;
     programMembershipUsed?: IAcceptedProgramMembershipUsed;
     reservedTicket?: {
+        /**
+         * チケット識別子
+         * 指定された場合、決済カードの対象チケット識別子と関連付けされます
+         * /^[0-9a-zA-Z]{8,16}$/
+         */
+        identifier?: string;
         issuedBy?: ReservationFactory.IUnderName;
         typeOf: ReservationFactory.TicketType;
         /**
-         * 予約座席指定
-         * 指定席イベントの場合、座席を指定
-         * 自由席イベントの場合、あるいは、最大収容人数がないイベントの場合は、座席指定不要
+         * 座席指定
          */
         ticketedSeat?: ReservationFactory.ISeat;
     };
@@ -225,10 +233,6 @@ export interface IObjectWithoutDetail {
 export type IReservationFor = IBusReservationReservationFor | IEventReservationReservationFor;
 export type IOmittedReservationProperty = 'reservationFor' | 'broker' | 'issuedThrough' | 'provider' | 'reservationStatus' | 'project' | 'reservationNumber' | 'bookingTime' | 'modifiedTime' | 'underName' | 'checkedIn' | 'attended';
 export type IObjectSubReservation = Omit<IBusReservation, IOmittedReservationProperty> | Omit<IEventReservation, IOmittedReservationProperty>;
-export type IObjectSubReservationReservedTicket = Pick<ReservationFactory.ITicket, 'issuedBy' | 'ticketedSeat' | 'ticketType'>;
-export type IMinimizedObjectSubReservation = Pick<IObjectSubReservation, 'typeOf' | 'id' | 'subReservation'> & {
-    reservedTicket: IObjectSubReservationReservedTicket;
-};
 export type IIssuedThrough = IBusReservationIssuedThrough | IEventReservationIssuedThrough;
 /**
  * 取引対象物

package/lib/index.d.ts

@@ -340,7 +340,7 @@ export import organizationType = OrganizationType;
 export import ownershipInfo = OwnershipInfoFactory;
 export declare namespace paymentMethod {
     type ISearchConditions = any;
-    type IPaymentMethod = CreditCardFactory.ICheckedCard | MovieTicketFactory.IMovieTicket;
+    type IPaymentMethod = CreditCardFactory.ICheckedCard | MovieTicketFactory.IMovieTicketPaymentCard;
     namespace paymentCard {
         export import IPaymentCard = PaymentCardFactory.IPaymentCard;
         export import creditCard = CreditCardFactory;

package/lib/order.d.ts

@@ -89,28 +89,6 @@ export interface IReferencedInvoice {
     additionalProperty: IPropertyValue<string>[];
     issuedThrough: IOrderPaymentMethodIssuedThrough;
 }
-/**
- * ディスカウント
- */
-export interface IDiscount {
-    /**
-     * 割引タイプ
-     */
-    typeOf: string;
-    name: string;
-    /**
-     * Any discount applied.
-     */
-    discount: number;
-    /**
-     * Code used to redeem a discount.
-     */
-    discountCode: string;
-    /**
-     * The currency (in 3 - letter ISO 4217 format) of the discount.
-     */
-    discountCurrency: string;
-}
 export type IWorkPerformed = Pick<EventReservationFactory.IOptimizedWorkPerformed, 'typeOf' | 'id' | 'identifier' | 'name' | 'duration'>;
 export type ISuperEvent = Pick<EventReservationFactory.IOptimizedSuperEvent, 'id' | 'location' | 'name' | 'soundFormat' | 'typeOf' | 'videoFormat' | 'headline' | 'identifier' | 'alternativeHeadline' | 'duration' | 'coaInfo'> & {
     workPerformed: IWorkPerformed;
@@ -119,7 +97,8 @@ export type ITripAsReservationFor = BusReservationFactory.IReservationFor;
 export type IEventAsReservationFor = Omit<EventReservationFactory.IReservationFor, 'superEvent'> & {
     superEvent: ISuperEvent;
 };
-export type IReservedTicket = Pick<ITicket, 'typeOf' | 'ticketedSeat' | 'dateIssued' | 'ticketNumber' | 'ticketToken' | 'coaTicketInfo' | 'coaReserveAmount'> & {
+export type IReservedTicket = Pick<ITicket, 'typeOf' | 'ticketedSeat' | 'identifier' | // 追加(2024-04-15~)
+'ticketNumber' | 'dateIssued' | 'ticketToken' | 'coaTicketInfo' | 'coaReserveAmount'> & {
     ticketType: ITicketType;
 };
 export type IBusReservation = Pick<BusReservationFactory.IReservation, 'additionalProperty' | 'additionalTicketText' | 'id' | 'issuedThrough' | 'programMembershipUsed' | 'reservationNumber' | 'typeOf'> & {
@@ -303,10 +282,6 @@ export interface IOrder extends ISimpleOrder {
      * Date order was returned.
      */
     dateReturned?: Date;
-    /**
-     * discount infos
-     */
-    discounts: IDiscount[];
     /**
      * The identifier property represents any kind of identifier for any kind of Thing
      */
@@ -528,6 +503,14 @@ export interface IAcceptedOffersSearchConditions {
          * 使用メンバーシップ
          */
         programMembershipUsed?: IProgramMembershipUsedSearchConditions;
+        reservedTicket?: {
+            /**
+             * 予約チケット識別子
+             */
+            identifier?: {
+                $eq?: string;
+            };
+        };
     };
     serialNumber?: {
         $eq?: string;
@@ -545,19 +528,6 @@ export interface ISearchConditions {
             $eq?: string;
         };
     };
-    additionalProperty?: {
-        $all?: IPropertyValue<string>[];
-        $in?: IPropertyValue<string>[];
-        $nin?: IPropertyValue<string>[];
-        $elemMatch?: {
-            name?: {
-                /**
-                 * 一致する名称の追加特性がひとつでも存在する
-                 */
-                $eq?: string;
-            };
-        };
-    };
     broker?: {
         id?: {
             $eq?: string;

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

@@ -1,23 +1,43 @@
 import { EventType } from '../../eventType';
 import { ISeat } from '../../reservation';
 import { IPaymentCard } from '../paymentCard';
-export interface IReservationFor {
+export interface IMovieTicketReservationFor {
     typeOf: EventType.ScreeningEvent;
     id: string;
 }
-export interface IServiceOutput {
+export interface IMovieTicketServiceOutput {
     /**
      * 予約対象イベント
      */
-    reservationFor: IReservationFor;
+    reservationFor: IMovieTicketReservationFor;
     /**
      * 予約チケット
      */
     reservedTicket: {
+        /**
+         * チケット識別子
+         * 指定された場合、予約のチケット識別子と関連付けされます
+         * /^[0-9a-zA-Z]{8,16}$/
+         */
+        identifier?: string;
         ticketedSeat: ISeat;
     };
 }
-export interface IAttributes extends IPaymentCard {
+/**
+ * 決済カード
+ */
+export interface IMovieTicketPaymentCard extends Pick<IPaymentCard, 'accessCode' | 'amount' | 'serviceOutput' | 'serviceType' | 'identifier' | 'typeOf'> {
+    /**
+     * 決済方法区分コード
+     */
+    typeOf: string;
+    category: {
+        /**
+         * 前売券（カード）の種類
+         * 全国券,劇場券など
+         */
+        codeValue: string;
+    };
     /**
      * 購入管理番号
      */
@@ -33,21 +53,5 @@ export interface IAttributes extends IPaymentCard {
     /**
      * 利用対象予約
      */
-    serviceOutput: IServiceOutput;
-}
-/**
- * MovieTicket決済カード
- */
-export interface IMovieTicket extends IAttributes {
-    /**
-     * 決済方法区分コード
-     */
-    typeOf: string;
-    category: {
-        /**
-         * 前売券（カード）の種類
-         * 全国券,劇場券など
-         */
-        codeValue: string;
-    };
+    serviceOutput: IMovieTicketServiceOutput;
 }

package/lib/reservation.d.ts

@@ -19,7 +19,6 @@ import { IPropertyValue } from './propertyValue';
 import { ReservationStatusType } from './reservationStatusType';
 import { ReservationType } from './reservationType';
 import { SortType } from './sortType';
-import { IThing } from './thing';
 export type TicketType = 'Ticket';
 export interface ITicketType {
     additionalProperty?: IPropertyValue<string>[];
@@ -118,6 +117,10 @@ export interface ITicket {
      * The date the ticket was used.
      */
     dateUsed?: Date;
+    /**
+     * チケット識別子
+     */
+    identifier?: string;
     /**
      * The organization issuing the ticket or permit.
      */
@@ -134,15 +137,9 @@ export interface ITicket {
      */
     ticketedSeat?: ISeat;
     /**
-     * Where the ticket can be downloaded.
-     */
-    /**
-     * The number or id of the ticket.
+     * The unique identifier for the ticket.
      */
     ticketNumber?: string;
-    /**
-     * Where the ticket can be printed.
-     */
     /**
      * 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),
@@ -150,11 +147,7 @@ export interface ITicket {
      */
     ticketToken?: string;
     /**
-     * The person or organization the reservation is for.
-     * ルートのunderNameに統合(2022-12-19~)
-     */
-    /**
-     * 券種
+     * オファー
      */
     ticketType: ITicketType;
     /**
@@ -204,7 +197,7 @@ export interface IProvider {
  * For offers of tickets, restaurant reservations, flights, or rental cars, use Offer.
  * {@link https://schema.org/Reservation}
  */
-export interface IReservation<T extends Omit<IPriceSpecification, 'project'>> extends Pick<IThing, 'identifier' | 'name'> {
+export interface IReservation<T extends Omit<IPriceSpecification, 'project'>> {
     project: Pick<IProject, 'id' | 'typeOf'>;
     /**
      * type of object

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chevre/factory",
-  "version": "4.367.0-alpha.0",
+  "version": "4.367.0-alpha.10",
   "description": "Chevre Factory Library for Javascript",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",