@chevre/factory 8.1.0 → 8.2.0-alpha.1

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

@@ -3,11 +3,11 @@ import { ActionType } from '../actionType';
 import { AssetTransactionType } from '../assetTransactionType';
 import { IOrder } from '../order';
 import { IAvailableReservationStatusType } from '../reservation';
-import { IReservationForLegacy as IEventReservationFor } from '../reservation/event';
+import { IReservationForMinimized } from '../reservation/event';
 import { ReservationType } from '../reservationType';
 import { ITransaction as IPlaceOrder } from '../transaction/placeOrder';
 export type IAgent = IParticipantAsProject;
-export type IReservationFor = Pick<IEventReservationFor, 'id' | 'typeOf'> & {
+export type IReservationFor = Pick<IReservationForMinimized, 'id' | 'typeOf'> & {
     optimized: boolean;
 };
 export interface IObject {

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

@@ -3,7 +3,7 @@ import { IAgent, ISearchConditions as IBaseSearchConditions, IStartParams as IBa
 import { ITransaction as IReserveTransaction } from '../assetTransaction/reserve';
 import { AssetTransactionType } from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
-import { IReservation as IEventReservation, IReservationForLegacy as IEventReservationFor } from '../reservation/event';
+import { IReservation as IEventReservation, IReservationForMinimized as IEventReservationFor } from '../reservation/event';
 import { IReservation as IReservationPackage } from '../reservation/reservationPackage';
 export { IAgent };
 export type IStartParamsWithoutDetail = IBaseStartParams<AssetTransactionType.CancelReservation, IAgent, undefined, IObjectWithoutDetail>;

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

@@ -2,6 +2,9 @@ import { IInstrument as IReserveActionInstrument } from '../action/reserve';
 import { IAgent, ISearchConditions as IBaseSearchConditions, IStartParams as IBaseStartParams, IAttributes as IBaseAttributes } from '../assetTransaction';
 import { AssetTransactionType } from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
+import { IWorkPerformed } from '../event/eventSeries';
+import { ILocation as IEventLocation, IName as IEventName, ISuperEvent } from '../event/screeningEvent';
+import { EventType } from '../eventType';
 import { IMultilingualString } from '../multilingualString';
 import { ICategory as IOfferCategory, IValidRateLimit } from '../offer';
 import { OfferType } from '../offerType';
@@ -15,12 +18,58 @@ import { IPriceSpecification as IUnitPriceOfferPriceSpecification } from '../pri
 import { IServiceType, ProductType } from '../product';
 import { IPropertyValue } from '../propertyValue';
 import { ITicketIssuedBy, TicketType, IUnderName as IReservationUnderName, IBroker, ISeat as IReservationSeat } from '../reservation';
-import { IReservation as IEventReservation, IReservationForLegacy as IEventReservationReservationFor, IReservedTicket, ISubReservation as ISubReservation4eventReservation } from '../reservation/event';
+import { IReservation as IEventReservation, IReservedTicket, ISubReservation as ISubReservation4eventReservation } from '../reservation/event';
 import { IReservation as IReservationPackage } from '../reservation/reservationPackage';
 import { ReservationStatusType } from '../reservationStatusType';
 import { ReservationType } from '../reservationType';
 import { PaymentServiceType } from '../service/paymentService';
 import { IUnitPriceOffer } from '../unitPriceOffer';
+export type IOptimizedWorkPerformedLegacy = Pick<IWorkPerformed, 'typeOf' | 'id' | 'identifier' | 'duration' | 'contentRating' | 'version'> & {
+    name?: string | IMultilingualString;
+};
+/**
+ * 予約対象施設コンテンツ
+ */
+export type IOptimizedSuperEventLegacy = Pick<ISuperEvent, 'additionalProperty' | 'id' | 'location' | 'name' | 'soundFormat' | 'typeOf' | 'headline'> & {
+    workPerformed: IOptimizedWorkPerformedLegacy;
+    /**
+     * COA予約でのみ使用
+     */
+    identifier?: never;
+    /**
+     * COA予約でのみ使用
+     */
+    alternativeHeadline?: never;
+    /**
+     * COA予約でのみ使用
+     */
+    duration?: never;
+    /**
+     * COA予約でのみ使用
+     */
+    coaInfo?: never;
+};
+/**
+ * 予約対象イベント
+ */
+export interface IReservationForLegacy {
+    endDate: Date;
+    id: string;
+    location: IEventLocation;
+    name: IEventName;
+    startDate: Date;
+    superEvent: IOptimizedSuperEventLegacy;
+    typeOf: EventType.ScreeningEvent;
+    doorTime?: Date;
+    /**
+     * COA予約でのみ使用
+     */
+    identifier?: never;
+    /**
+     * COA予約でのみ使用
+     */
+    coaInfo?: never;
+}
 export { IAgent };
 export type IInstrument = IReserveActionInstrument;
 export type IStartParamsWithoutDetail = IBaseStartParams<AssetTransactionType.Reserve, IAgent, undefined, IObjectWithoutDetail>;
@@ -285,7 +334,7 @@ export interface IObjectWithoutDetail {
         id: string;
     };
 }
-export type IReservationFor = IEventReservationReservationFor;
+export type IReservationFor = IReservationForLegacy;
 /**
  * 予約取引に保管されるticketType
  */

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/notification/reservation.d.ts

@@ -1,7 +1,7 @@
 import { ActionType } from '../actionType';
-import { IIssuedThrough, IPrice } from '../assetTransaction/reserve';
-import { IProvider, ITicket, IUnderName } from '../reservation';
-import { IReservation as IEventReservation, IReservationForLegacy } from '../reservation/event';
+import { IIssuedThrough, IPrice, IReservationForLegacy } from '../assetTransaction/reserve';
+import { IProvider, IUnderName } from '../reservation';
+import { IReservation as IEventReservation } from '../reservation/event';
 import { ReservationStatusType } from '../reservationStatusType';
 import { ReservationType } from '../reservationType';
 import { ISubReservationReservedTicket } from '../assetTransaction/reserve';
@@ -49,7 +49,9 @@ export interface IReservation4informCheckedIn {
     /**
      * 発券通知がarrayの場合、ひとつめのみreservedTicket.ticketTokenが含まれる(2024-10-30~)
      */
-    reservedTicket?: Pick<ITicket, 'ticketToken'>;
+    reservedTicket?: {
+        ticketToken?: string;
+    };
     reservationNumber?: never;
     reservationStatus?: never;
     attended?: never;
@@ -67,7 +69,9 @@ export interface IReservationPackage4informCheckedIn {
     /**
      * 発券通知がarrayの場合、ひとつめのみreservedTicket.ticketTokenが含まれる(2024-10-30~)
      */
-    reservedTicket?: Pick<ITicket, 'ticketToken'>;
+    reservedTicket?: {
+        ticketToken?: string;
+    };
     subReservation: Pick<ISubReservation4inform, 'id'>[];
     id?: never;
     reservationStatus?: never;

package/lib/chevre/order.d.ts

@@ -1,6 +1,6 @@
 import type { COAFactory } from '@coasystems/factory';
 import { IParticipantAsPerson, IParticipantAsProject, IParticipantAsWebApplication } from './action';
-import { ICategoryChargePriceComponent, IMovieTicketTypeChargePriceComponent, IUnitPriceComponent, IIssuedThrough, IServiceTypeOfIssuedThrough, ITicketType } from './assetTransaction/reserve';
+import { ICategoryChargePriceComponent, IMovieTicketTypeChargePriceComponent, IUnitPriceComponent, IIssuedThrough, IServiceTypeOfIssuedThrough, ITicketType, IOptimizedSuperEventLegacy, IOptimizedWorkPerformedLegacy, IReservationForLegacy } from './assetTransaction/reserve';
 import { ICreativeWork as IWebApplication } from './creativeWork/softwareApplication/webApplication';
 import { ICustomer as ICustomerOrganization } from './customer';
 import { ICOAInfo, ISuperEvent as IEventSeries } from './event/screeningEvent';
@@ -19,10 +19,11 @@ import { PriceCurrency } from './priceCurrency';
 import { IPriceSpecification as ICompoundPriceSpecification } from './priceSpecification/compoundPriceSpecification';
 import { ProductType } from './product';
 import { IPropertyValue } from './propertyValue';
-import { IOptimizedSuperEventLegacy, IOptimizedWorkPerformedLegacy, IReservation as IRawReservation, IReservationForLegacy, IReservedTicket as IRawReservedTicket } from './reservation/event';
+import { IReservation as IRawReservation, IReservedTicket as IRawReservedTicket } from './reservation/event';
 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 };
@@ -165,13 +166,23 @@ export type ICOATicketType = Pick<ITicketType, 'id' | 'identifier' | 'name' | 't
  * COAの場合の予約チケット
  */
 export type ICOAReservedTicket = Pick<IRawReservedTicket, 'typeOf' | 'ticketedSeat' | 'identifier' | // 追加(2024-04-15~)
-'ticketNumber' | 'dateIssued' | 'ticketToken'> & {
+'dateIssued'> & {
     ticketType: ICOATicketType;
     /**
      * COA券種情報
      */
     coaTicketInfo?: ICOATicketInfoWithDetails;
     coaReserveAmount?: number;
+    /**
+     * The unique identifier for the ticket.
+     */
+    ticketNumber?: string;
+    /**
+     * 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;
 };
 export interface ICOAIssuedThrough {
     typeOf: ProductType.EventService;
@@ -211,20 +222,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: IItemOffered;
+    itemOffered: ICOAEventReservation;
+    offeredThrough: Pick<IService<Identifier>, 'typeOf'> & {
+        identifier: Identifier.COA;
+    };
     priceSpecification?: ITicketPriceSpecification;
     /**
-     * 資産取引を特定する番号(2024-01-30~)
+     * 資産取引番号
+     * 2024-01-30~
      */
-    serialNumber?: string;
+    serialNumber: string;
 }
+export interface IOptimizedAcceptedOffer extends IOfferOptimized4acceptedOffer {
+    /**
+     * オファー対象アイテム
+     */
+    itemOffered: IEventReservation;
+    offeredThrough: Pick<IService<Identifier>, 'typeOf'> & {
+        identifier: Identifier.Chevre;
+    };
+    priceSpecification?: ITicketPriceSpecification;
+    /**
+     * 資産取引番号
+     * 2024-01-30~
+     */
+    serialNumber: string;
+}
+/**
+ * 受け入れオファー
+ */
+export type IAcceptedOffer = ICOAAcceptedOffer | IOptimizedAcceptedOffer;
 /**
  * 販売者
  */

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

@@ -1,57 +1,10 @@
-import { ILocation as IEventLocation, IName as IEventName, ISuperEvent } from '../event/screeningEvent';
+import { ILocation as IEventLocation, ISuperEvent } from '../event/screeningEvent';
 import { IWorkPerformed } from '../event/eventSeries';
 import { EventType } from '../eventType';
-import { IMultilingualString } from '../multilingualString';
 import { TicketType, ISeat as IReservationSeat, IReservation as IBaseReservation, IAvailableReservationStatusType, ITicket } from '../reservation';
 import { ReservationStatusType } from '../reservationStatusType';
 import { ReservationType } from '../reservationType';
 import { SortType } from '../sortType';
-export type IOptimizedWorkPerformedLegacy = Pick<IWorkPerformed, 'typeOf' | 'id' | 'identifier' | 'duration' | 'contentRating' | 'version'> & {
-    name?: string | IMultilingualString;
-};
-/**
- * 予約対象施設コンテンツ
- */
-export type IOptimizedSuperEventLegacy = Pick<ISuperEvent, 'additionalProperty' | 'id' | 'location' | 'name' | 'soundFormat' | 'typeOf' | 'headline'> & {
-    workPerformed: IOptimizedWorkPerformedLegacy;
-    /**
-     * COA予約でのみ使用
-     */
-    identifier?: never;
-    /**
-     * COA予約でのみ使用
-     */
-    alternativeHeadline?: never;
-    /**
-     * COA予約でのみ使用
-     */
-    duration?: never;
-    /**
-     * COA予約でのみ使用
-     */
-    coaInfo?: never;
-};
-/**
- * 予約対象イベント
- */
-export interface IReservationForLegacy {
-    endDate: Date;
-    id: string;
-    location: IEventLocation;
-    name: IEventName;
-    startDate: Date;
-    superEvent: IOptimizedSuperEventLegacy;
-    typeOf: EventType.ScreeningEvent;
-    doorTime?: Date;
-    /**
-     * COA予約でのみ使用
-     */
-    identifier?: never;
-    /**
-     * COA予約でのみ使用
-     */
-    coaInfo?: never;
-}
 export type IMinimizedWorkPerformed = Pick<IWorkPerformed, 'typeOf' | 'id' | 'identifier' | 'version'> & {
     duration?: never;
     contentRating?: never;
@@ -102,6 +55,8 @@ export type IReservedTicket = ITicket & {
      * 予約ドキュメント内のticketTypeは廃止済(2026-03-26~)
      */
     ticketType?: never;
+    ticketNumber?: never;
+    ticketToken?: never;
 };
 /**
  * イベント予約
@@ -187,10 +142,6 @@ export interface IReservedTicketSearchConditions {
             $in?: string[];
         };
     };
-    /**
-     * discontinue ticketType(2026-05-06~)
-     */
-    ticketType?: never;
 }
 export interface IStringSearchConditions {
     $eq?: string;

package/lib/chevre/reservation.d.ts

@@ -89,21 +89,10 @@ export interface ITicket {
      * 座席指定でない場合、この値は存在しない
      */
     ticketedSeat?: ISeat;
-    /**
-     * The unique identifier for the ticket.
-     */
-    ticketNumber?: string;
-    /**
-     * 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;
 }
 export interface IBroker {
     typeOf: PersonType.Person;
     id: string;
-    name?: string;
 }
 export type IProgramMembershipIssuedThroughFaceToFace = Pick<IProgramMembership, 'typeOf'> & {
     identifier: string;

package/package.json

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