@chevre/factory 6.0.0-alpha.7 → 6.0.0-alpha.8

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

@@ -1,15 +1,19 @@
 import { IParticipantAsPerson, IParticipantAsWebApplication } from '../../../action';
 import { IOrder } from '../../../order';
 import { PlaceType } from '../../../placeType';
-import { ITicket, ITicketType, TicketType } from '../../../reservation';
+import { ITicket, TicketType } from '../../../reservation';
 import { IIssuedThrough, IReservation, IReservationFor } from '../../../reservation/event';
 import * as UseActionFactory from '../use';
 export type IAgent = IParticipantAsPerson | IParticipantAsWebApplication;
+/**
+ * 予約使用アクションオブジェクト
+ * optimize(2024-05-06~)
+ */
 export interface IReservationAsObject extends Pick<IReservation, 'id' | 'reservationNumber' | 'typeOf'> {
     issuedThrough: Pick<IIssuedThrough, 'id' | 'typeOf'>;
     reservationFor: Pick<IReservationFor, 'id' | 'typeOf'>;
     reservedTicket: Pick<ITicket, 'identifier' | 'ticketedSeat' | 'typeOf'> & {
-        ticketType: Pick<ITicketType, 'id' | 'identifier' | 'typeOf'>;
+        ticketType?: never;
     };
 }
 export type IObject = IReservationAsObject[];

package/lib/assetTransaction/reserve.d.ts

@@ -9,7 +9,7 @@ import { PermitType } from '../permit';
 import { ProductType } from '../product';
 import { IPropertyValue } from '../propertyValue';
 import * as ReservationFactory from '../reservation';
-import { IIssuedThrough as IEventReservationIssuedThrough, IPrice as IReservationPrice, IReservation as IEventReservation, IReservationFor as IEventReservationReservationFor, ISubReservation as ISubReservation4eventReservation } from '../reservation/event';
+import { IIssuedThrough as IEventReservationIssuedThrough, IPrice as IReservationPrice, IReservation as IEventReservation, IReservationFor as IEventReservationReservationFor, IReservedTicket, ISubReservation as ISubReservation4eventReservation, ITicketType } from '../reservation/event';
 import { IReservation as IReservationPackage } from '../reservation/reservationPackage';
 import { ReservationStatusType } from '../reservationStatusType';
 import { ReservationType } from '../reservationType';
@@ -298,8 +298,12 @@ export interface IObjectWithoutDetail {
     };
 }
 export type IReservationFor = IEventReservationReservationFor;
-export type IEventReservationAsSubReservation = Pick<IEventReservation, 'additionalProperty' | 'additionalTicketText' | 'id' | 'numSeats' | 'priceCurrency' | 'programMembershipUsed' | 'reservedTicket' | 'subReservation' | 'typeOf'> & {
+export type ISubReservationReservedTicket = IReservedTicket & {
+    ticketType: ITicketType;
+};
+export type IEventReservationAsSubReservation = Pick<IEventReservation, 'additionalProperty' | 'additionalTicketText' | 'id' | 'numSeats' | 'priceCurrency' | 'programMembershipUsed' | 'subReservation' | 'typeOf'> & {
     price?: IReservationPrice;
+    reservedTicket: ISubReservationReservedTicket;
 };
 export type IObjectSubReservation = IEventReservationAsSubReservation;
 export type IIssuedThrough = IEventReservationIssuedThrough;

package/lib/index.d.ts

@@ -485,11 +485,9 @@ export declare namespace reservation {
     type ISortOrder<T extends ReservationType> = T extends ReservationType.EventReservation ? ReservationFactory.ISortOrder : ReservationFactory.ISortOrder;
     type ISeat<T extends ReservationType> = T extends ReservationType.EventReservation ? ReservationFactory.ISeat : ReservationFactory.ISeat;
     type ISubReservation<T extends ReservationType> = T extends ReservationType.EventReservation ? EventReservationFactory.ISubReservation : T extends ReservationType.ReservationPackage ? ReservationPackageFactory.ISubReservation : any;
-    export import ITicket = ReservationFactory.ITicket;
     type IUnderName<T extends ReservationType> = T extends ReservationType.EventReservation ? ReservationFactory.IUnderName : ReservationFactory.IUnderName;
-    type ITicketIssuedBy<T extends ReservationType> = T extends ReservationType.EventReservation ? ReservationFactory.ITicketIssuedBy : ReservationFactory.ITicketIssuedBy;
-    type TicketType<T extends ReservationType> = T extends ReservationType.EventReservation ? ReservationFactory.TicketType : ReservationFactory.TicketType;
-    type ITicketType<T extends ReservationType> = T extends ReservationType.EventReservation ? ReservationFactory.ITicketType : ReservationFactory.ITicketType;
+    type ITicketIssuedBy = ReservationFactory.ITicketIssuedBy;
+    type TicketType = ReservationFactory.TicketType;
     export import IServiceTypeOfIssuedThrough = ReservationFactory.IServiceTypeOfIssuedThrough;
     export import IServiceLocationContainedInPlace = ReservationFactory.IServiceLocationContainedInPlace;
     export import IServiceLocation = ReservationFactory.IServiceLocation;

package/lib/order.d.ts

@@ -16,7 +16,7 @@ import { PriceCurrency } from './priceCurrency';
 import { IPriceSpecification as ICompoundPriceSpecification } from './priceSpecification/compoundPriceSpecification';
 import { IMembershipProduct, IPaymentCardProduct, ProductType } from './product';
 import { IPropertyValue } from './propertyValue';
-import { IProgramMembershipUsedSearchConditions, ITicket, ITicketType } from './reservation';
+import { IProgramMembershipUsedSearchConditions } from './reservation';
 import * as EventReservationFactory from './reservation/event';
 import { ReservationType } from './reservationType';
 import { ISeller as IBaseSeller } from './seller';
@@ -90,9 +90,9 @@ export type ISuperEvent = Pick<EventReservationFactory.IOptimizedSuperEvent, 'id
 export type IEventAsReservationFor = Omit<EventReservationFactory.IReservationFor, 'superEvent'> & {
     superEvent: ISuperEvent;
 };
-export type IReservedTicket = Pick<ITicket, 'typeOf' | 'ticketedSeat' | 'identifier' | // 追加(2024-04-15~)
+export type IReservedTicket = Pick<EventReservationFactory.IReservedTicket, 'typeOf' | 'ticketedSeat' | 'identifier' | // 追加(2024-04-15~)
 'ticketNumber' | 'dateIssued' | 'ticketToken' | 'coaTicketInfo' | 'coaReserveAmount'> & {
-    ticketType: ITicketType;
+    ticketType: EventReservationFactory.ITicketType;
 };
 export type IEventReservation = Pick<EventReservationFactory.IReservation, 'additionalProperty' | 'additionalTicketText' | 'id' | 'issuedThrough' | 'programMembershipUsed' | 'reservationNumber' | 'typeOf'> & {
     reservationFor: IEventAsReservationFor;

package/lib/reservation/event.d.ts

@@ -1,12 +1,16 @@
+import type * as COA from '@motionpicture/coa-service';
 import { ICOAInfo, ILocation as IEventLocation, IName as IEventName, ISuperEvent } from '../event/screeningEvent';
 import { IWorkPerformed } from '../event/screeningEventSeries';
 import { EventType } from '../eventType';
 import { IMultilingualString } from '../multilingualString';
+import * as OfferFactory from '../offer';
+import { OfferType } from '../offerType';
 import { IPriceSpecification as ICategoryCodeChargeSpecification } from '../priceSpecification/categoryCodeChargeSpecification';
 import { IPriceSpecification as ICompoundPriceSpecification } from '../priceSpecification/compoundPriceSpecification';
 import { IPriceSpecification as IMovieTicketTypeChargeSpecification } from '../priceSpecification/movieTicketTypeChargeSpecification';
 import { IPriceSpecification as IUnitPriceOfferPriceSpecification } from '../priceSpecification/unitPriceSpecification';
 import { ProductType } from '../product';
+import { IPropertyValue } from '../propertyValue';
 import * as ReservationFactory from '../reservation';
 import { ReservationStatusType } from '../reservationStatusType';
 import { ReservationType } from '../reservationType';
@@ -64,6 +68,49 @@ export interface IIssuedThrough4COA extends ReservationFactory.IIssuedThrough {
      */
     id?: never;
 }
+export interface ITicketType {
+    additionalProperty?: IPropertyValue<string>[];
+    category?: OfferFactory.ICategory;
+    color?: string;
+    description?: string | IMultilingualString;
+    id?: string;
+    identifier: string;
+    name?: IMultilingualString;
+    typeOf: OfferType.Offer;
+    validRateLimit?: OfferFactory.IValidRateLimit;
+}
+/**
+ * COA券種情報
+ */
+export type ICOATicketInfoWithDetails = COA.factory.reserve.IUpdReserveTicket & {
+    /**
+     * チケット名
+     */
+    ticketName: string;
+    /**
+     * チケット名（カナ）
+     */
+    ticketNameKana: string;
+    /**
+     * チケット名（英）
+     */
+    ticketNameEng: string;
+    /**
+     * ポイント割引の場合の消費ポイント
+     */
+    usePoint: number;
+};
+export type IReservedTicket = ReservationFactory.ITicket & {
+    /**
+     * オファー
+     */
+    ticketType?: ITicketType;
+    /**
+     * COA券種情報
+     */
+    coaTicketInfo?: ICOATicketInfoWithDetails;
+    coaReserveAmount?: number;
+};
 /**
  * イベント予約
  */
@@ -74,7 +121,7 @@ export interface IReservation extends ReservationFactory.IReservation<IPriceSpec
     reservationFor: IReservationFor;
     reservationNumber: string;
     reservationStatus: ReservationStatusType.ReservationCancelled | ReservationStatusType.ReservationConfirmed;
-    reservedTicket: ReservationFactory.ITicket;
+    reservedTicket: IReservedTicket;
     subReservation?: ISubReservation[];
     typeOf: ReservationType.EventReservation;
 }

package/lib/reservation.d.ts

@@ -1,8 +1,5 @@
-import type * as COA from '@motionpicture/coa-service';
 import { CreativeWorkType } from './creativeWorkType';
 import { IMultilingualString } from './multilingualString';
-import * as OfferFactory from './offer';
-import { OfferType } from './offerType';
 import { OrganizationType } from './organizationType';
 import { PersonType } from './personType';
 import * as MovieTheaterFactory from './place/movieTheater';
@@ -21,17 +18,6 @@ import { ReservationType } from './reservationType';
 import { PaymentServiceType } from './service/paymentService';
 import { SortType } from './sortType';
 export type TicketType = 'Ticket';
-export interface ITicketType {
-    additionalProperty?: IPropertyValue<string>[];
-    category?: OfferFactory.ICategory;
-    color?: string;
-    description?: string | IMultilingualString;
-    id?: string;
-    identifier: string;
-    name?: IMultilingualString;
-    typeOf: OfferType.Offer;
-    validRateLimit?: OfferFactory.IValidRateLimit;
-}
 export type IPriceSpecification = IGenericPriceSpecification<PriceSpecificationType>;
 export type ISeatingType = SeatFactory.ISeatingType;
 export type IUnderNameType = CreativeWorkType.WebApplication | PersonType.Person | OrganizationType.Organization | OrganizationType.Corporation | OrganizationType.Project;
@@ -79,27 +65,6 @@ export interface ISeat {
      */
     seatSection: string;
 }
-/**
- * COA券種情報
- */
-export type ICOATicketInfoWithDetails = COA.factory.reserve.IUpdReserveTicket & {
-    /**
-     * チケット名
-     */
-    ticketName: string;
-    /**
-     * チケット名（カナ）
-     */
-    ticketNameKana: string;
-    /**
-     * チケット名（英）
-     */
-    ticketNameEng: string;
-    /**
-     * ポイント割引の場合の消費ポイント
-     */
-    usePoint: number;
-};
 export type IReservationFor = any;
 /**
  * 予約チケット情報
@@ -126,12 +91,6 @@ export interface ITicket {
      * The organization issuing the ticket or permit.
      */
     issuedBy?: ITicketIssuedBy;
-    /**
-     * The total price for the reservation or ticket, including applicable taxes, shipping, etc.
-     */
-    /**
-     * The currency (in 3-letter ISO 4217 format) of the Reservation's price.
-     */
     /**
      * The seat associated with the ticket.
      * 座席指定でない場合、この値は存在しない
@@ -147,15 +106,6 @@ export interface ITicket {
      * "aztecCode:AB34" (Aztec codes), "barcodeEAN:1234" (EAN codes) and "barcodeUPCA:1234" (UPCA codes).
      */
     ticketToken?: string;
-    /**
-     * オファー
-     */
-    ticketType: ITicketType;
-    /**
-     * COA券種情報
-     */
-    coaTicketInfo?: ICOATicketInfoWithDetails;
-    coaReserveAmount?: number;
 }
 export interface IBroker {
     typeOf: PersonType.Person;

package/package.json

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