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

package/lib/action/authorize/offer/eventService.d.ts

@@ -5,8 +5,10 @@ import * as ReserveTransactionFactory from '../../../assetTransaction/reserve';
 import { AssetTransactionType } from '../../../assetTransactionType';
 import * as ScreeningEventFactory from '../../../event/screeningEvent';
 import * as OfferFactory from '../../../offer';
+import { OfferType } from '../../../offerType';
 import * as OrderFactory from '../../../order';
 import { PriceCurrency } from '../../../priceCurrency';
+import { IPriceSpecification as IUnitPriceSpecification } from '../../../priceSpecification/unitPriceSpecification';
 import { ICategoryCodeChargePriceComponent, IMovieTicketTypeChargePriceComponent, ITicketOffer, ITicketPriceSpecification, ITicketUnitPriceComponent } from '../../../product';
 import * as WebAPIFactory from '../../../service/webAPI';
 import { TransactionType } from '../../../transactionType';
@@ -48,10 +50,25 @@ export type IInstrumentAsAssetTransaction<T extends WebAPIFactory.Identifier> =
 export type IRequestBody<T extends WebAPIFactory.Identifier> = T extends WebAPIFactory.Identifier.COA ? COA.factory.reserve.IUpdTmpReserveSeatArgs : T extends WebAPIFactory.Identifier.Chevre ? {} : never;
 export type IResponseBody<T extends WebAPIFactory.Identifier> = T extends WebAPIFactory.Identifier.COA ? COA.factory.reserve.IUpdTmpReserveSeatResult : T extends WebAPIFactory.Identifier.Chevre ? {} : never;
 export type IResultAcceptedOffer = OrderFactory.IAcceptedOffer<OrderFactory.IReservation>;
-/**
- * 承認アクション結果
- */
-export interface IResult {
+export interface IAcceptedOfferInResult extends Pick<ITicketOffer, 'acceptedPaymentMethod' | 'id' | 'typeOf'> {
+    typeOf: OfferType.Offer;
+    id: string;
+    includesObject: {
+        amountOfThisGood: number;
+    };
+    /**
+     * 取引確定時の検証に必要な情報のみ保管する
+     */
+    priceSpecification?: Pick<IUnitPriceSpecification, 'eligibleQuantity' | 'eligibleTransactionVolume'>;
+}
+export interface IResultAsAggregateOffer {
+    typeOf?: OfferType.AggregateOffer;
+    /**
+     * オファーIDごとの集計
+     */
+    offers?: IAcceptedOfferInResult[];
+}
+export interface IResult extends IResultAsAggregateOffer {
     /**
      * 決済金額
      * オファー未指定の場合、金額非確定なので、この属性は存在しない
@@ -63,13 +80,6 @@ export interface IResult {
      * currencyを口座タイプとして扱う
      */
     amount: OrderFactory.ITotalPaymentDue[];
-    /**
-     * 外部サービスへのリクエスト
-     */
-    /**
-     * 外部サービスからのレスポンス
-     */
-    acceptedOffers?: IResultAcceptedOffer[];
 }
 export type ExcludedFieldsFromTicketPriceComponent = 'accounting' | 'id' | 'name' | 'priceCurrency' | 'valueAddedTaxIncluded';
 export type ITicketPriceComponent = Omit<ICategoryCodeChargePriceComponent, ExcludedFieldsFromTicketPriceComponent> | Omit<IMovieTicketTypeChargePriceComponent, ExcludedFieldsFromTicketPriceComponent> | Omit<ITicketUnitPriceComponent, ExcludedFieldsFromTicketPriceComponent>;
@@ -86,8 +96,7 @@ export type IAcceptedOfferPriceSpecification = Pick<ITicketPriceSpecification, '
 /**
  * 受け入れられたチケットオファー
  */
-export type IAcceptedOffer4chevre = Pick<ITicketOffer, 'acceptedPaymentMethod' | // add(2023-11-15~)
-'id' | 'identifier' | 'typeOf' | 'priceCurrency' | 'itemOffered' | 'additionalProperty'> & Pick<ReserveTransactionFactory.IAcceptedTicketOfferWithoutDetail, 'id' | 'addOn' | 'additionalProperty'> & {
+export type IAcceptedOffer4chevre = Pick<ITicketOffer, 'acceptedPaymentMethod' | 'id' | 'identifier' | 'typeOf' | 'priceCurrency' | 'itemOffered' | 'additionalProperty'> & Pick<ReserveTransactionFactory.IAcceptedTicketOfferWithoutDetail, 'id' | 'addOn' | 'additionalProperty'> & {
     addOn?: ReserveTransactionFactory.IAcceptedAddOn[];
     itemOffered?: ReserveTransactionFactory.IAcceptedTicketOfferItemOffered;
     priceSpecification: IAcceptedOfferPriceSpecification;
@@ -137,7 +146,7 @@ export interface IObjectWithoutDetail4COA {
         id: string;
     };
 }
-export type IAcceptedOffer<T extends WebAPIFactory.Identifier> = T extends WebAPIFactory.Identifier.COA ? IAcceptedOffer4COA : T extends WebAPIFactory.Identifier.Chevre ? IAcceptedOffer4chevre : never;
+export type IAcceptedOffer<T extends WebAPIFactory.Identifier> = T extends WebAPIFactory.Identifier.COA ? IAcceptedOffer4COA : T extends WebAPIFactory.Identifier.Chevre ? Pick<IAcceptedOffer4chevre, 'acceptedPaymentMethod' | 'id' | 'priceSpecification' | 'typeOf'> : never;
 export type IAcceptedOfferWithoutDetail<T extends WebAPIFactory.Identifier> = T extends WebAPIFactory.Identifier.COA ? IAcceptedOfferWithoutDetail4COA : T extends WebAPIFactory.Identifier.Chevre ? IAcceptedOfferWithoutDetail4chevre : never;
 export type IObjectWithoutDetail<T extends WebAPIFactory.Identifier> = T extends WebAPIFactory.Identifier.COA ? IObjectWithoutDetail4COA : T extends WebAPIFactory.Identifier.Chevre ? IObjectWithoutDetail4chevre : never;
 export type ICOAPendingTransaction = Pick<COA.factory.reserve.IDelTmpReserveArgs, 'theaterCode' | 'dateJouei' | 'titleCode' | 'titleBranchNum' | 'timeBegin' | 'tmpReserveNum'> & {
@@ -160,7 +169,7 @@ export type IEvent = Pick<ScreeningEventFactory.IEvent, 'id' | 'typeOf'> & {
 export type IObject<T extends WebAPIFactory.Identifier> = {
     typeOf: ObjectType;
     event?: IEvent;
-    acceptedOffer: IAcceptedOffer<T>[];
+    acceptedOffer?: IAcceptedOffer<T>[];
     /**
      * recipe有(仮予約時)のCOA興行オファー採用アクションID(2024-06-11~)
      */

package/lib/action/authorize/offer/moneyTransfer.d.ts

@@ -18,7 +18,6 @@ export interface IResult {
     priceCurrency: PriceCurrency;
     requestBody?: IRequestBody;
     responseBody: IResponseBody;
-    acceptedOffers: IResultAcceptedOffer[];
 }
 export import IItemOffered = OrderFactory.IMoneyTransfer;
 export interface IAcceptedOffer extends Omit<IOffer, 'addOn' | 'availability' | 'availableAtOrFrom'> {

package/lib/action/authorize/offer/product.d.ts

@@ -43,7 +43,6 @@ export type IResultAcceptedOffer = OrderFactory.IAcceptedOffer<OrderFactory.IPer
 export interface IResult {
     price: number;
     priceCurrency: PriceCurrency;
-    acceptedOffers: IResultAcceptedOffer;
     requestBody: RegisterServiceTransactionFactory.IStartParamsWithoutDetail;
     responseBody: RegisterServiceTransactionFactory.ITransaction;
 }

package/lib/action/authorize/paymentMethod/any.d.ts

@@ -135,7 +135,7 @@ export interface IResultAsInvoice {
 }
 export type IResult = IResultAsInvoice | IResultAsInvoice[];
 export interface IPurpose {
-    typeOf: TransactionType;
+    typeOf: TransactionType.PlaceOrder;
     id: string;
 }
 export declare enum ServiceIdentifier {

package/lib/action/transfer/return/{paymentMethod.d.ts → invoice.d.ts}

@@ -1,12 +1,15 @@
 import * as ActionFactory from '../../../action';
+import { AssetTransactionType } from '../../../assetTransactionType';
 import { IInvoice } from '../../../invoice';
 import { IReferencedInvoice, ISimpleOrder } from '../../../order';
 import { IAttributes as ISendEmailMessageActionAttributes } from '../../transfer/send/message/email';
 import * as ReturnActionFactory from '../return';
 export type IAgent = ActionFactory.IParticipantAsProject;
-export type IRecipient = ActionFactory.IParticipant;
+type IRecipientAttributes = 'id' | 'name' | 'typeOf';
+export type IRecipient = Pick<ActionFactory.IParticipantAsCustomer, IRecipientAttributes> | Pick<ActionFactory.IParticipantAsPerson, IRecipientAttributes> | Pick<ActionFactory.IParticipantAsWebApplication, IRecipientAttributes>;
 export type IObject = Pick<IReferencedInvoice, 'accountId' | 'issuedThrough' | 'paymentMethod' | 'paymentMethodId' | 'totalPaymentDue' | 'name' | 'additionalProperty'> & Pick<IInvoice, 'typeOf'>;
-export type IResult = any;
+export interface IResult {
+}
 export interface IPotentialActions {
     /**
      * 返金処理完了を通知するEメール送信アクション
@@ -14,13 +17,19 @@ export interface IPotentialActions {
     sendEmailMessage?: ISendEmailMessageActionAttributes[];
 }
 export type IPurpose = ISimpleOrder;
-export interface IAttributes extends ReturnActionFactory.IAttributes<IObject, IResult> {
+export interface IInstrument {
+    typeOf: AssetTransactionType.Refund;
+    transactionNumber: string;
+}
+export interface IAttributes extends Pick<ReturnActionFactory.IAttributes<IObject, IResult>, 'agent' | 'error' | 'instrument' | 'object' | 'potentialActions' | 'purpose' | 'recipient' | 'result' | 'project' | 'sameAs' | 'typeOf'> {
     agent: IAgent;
     recipient: IRecipient;
     purpose: IPurpose;
     potentialActions?: IPotentialActions;
+    instrument?: IInstrument;
 }
 /**
- * 決済返却アクション
+ * 請求返却アクション
  */
 export type IAction = ReturnActionFactory.IAction<IAttributes>;
+export {};

package/lib/action/transfer/return/order.d.ts

@@ -1,6 +1,6 @@
 import * as ActionFactory from '../../../action';
 import * as OrderFactory from '../../../order';
-import { IAttributes as IReturnPaymentMethodActionAttributes } from '../../transfer/return/paymentMethod';
+import { IAttributes as IReturnInvoiceActionAttributes } from '../../transfer/return/invoice';
 import * as ReturnActionFactory from '../return';
 import { IAttributes as ISendEmailMessageActionAttributes } from '../send/message/email';
 import * as ReturnPointAwardActionFactory from './pointAward';
@@ -16,12 +16,13 @@ export type IObject = OrderFactory.ISimpleOrder & {
     dateReturned: Date;
 };
 export type IResult = any;
+export type IPotentialReturnInvoiceAction = Pick<IReturnInvoiceActionAttributes, 'object' | 'potentialActions'>;
 export interface IPotentialActions {
     /**
      * 決済返却アクション
      * refundから移行(2022-08-10~)
      */
-    returnPaymentMethod: IReturnPaymentMethodActionAttributes[];
+    returnPaymentMethod: IPotentialReturnInvoiceAction[];
     /**
      * ポイントインセンティブ返却アクション
      */

package/lib/action.d.ts

@@ -207,19 +207,6 @@ export interface ISearchConditions {
                 $in?: string[];
             };
         };
-        acceptedOffer?: {
-            itemOffered?: {
-                serviceOutput?: {
-                    reservedTicket?: {
-                        ticketedSeat?: {
-                            seatNumber?: {
-                                $in?: string[];
-                            };
-                        };
-                    };
-                };
-            };
-        };
         typeOf?: {
             $eq?: string;
             $in?: string[];

package/lib/assetTransaction.d.ts

@@ -105,10 +105,12 @@ export type IAttributes<TStartParams, TResult, TError, TPotentialActions> = TSta
     tasksExportAction?: ITasksExportAction;
     /**
      * タスクエクスポート日時
+     * @deprecated use tasksExportAction
      */
     tasksExportedAt?: Date;
     /**
      * タスクエクスポート状態
+     * @deprecated use tasksExportAction
      */
     tasksExportationStatus: TransactionTasksExportationStatus;
     /**
@@ -145,8 +147,12 @@ export interface ISearchConditions<T extends AssetTransactionType> {
     ids?: string[];
     /**
      * ステータスリスト
+     * @deprecated use tasksExportAction
      */
     statuses?: TransactionStatusType[];
+    status?: {
+        $in?: TransactionStatusType[];
+    };
     /**
      * 開始日時(から)
      */
@@ -170,5 +176,10 @@ export interface ISearchConditions<T extends AssetTransactionType> {
         $eq?: string;
         $in?: string[];
     };
-    tasksExportationStatuses?: TransactionTasksExportationStatus[];
+    tasksExportAction?: {
+        actionStatus?: {
+            $eq?: ActionStatusType;
+            $in?: ActionStatusType[];
+        };
+    };
 }

package/lib/index.d.ts

@@ -33,9 +33,9 @@ import * as RefundActionFactory from './action/trade/refund';
 import * as GiveActionFactory from './action/transfer/give';
 import * as GivePointAwardActionFactory from './action/transfer/give/pointAward';
 import * as MoneyTransferActionFactory from './action/transfer/moneyTransfer';
+import * as ReturnInvoiceActionFactory from './action/transfer/return/invoice';
 import * as ReturnMoneyTransferActionFactory from './action/transfer/return/moneyTransfer';
 import * as ReturnOrderActionFactory from './action/transfer/return/order';
-import * as ReturnPaymentMethodActionFactory from './action/transfer/return/paymentMethod';
 import * as ReturnPointAwardActionFactory from './action/transfer/return/pointAward';
 import * as ReturnReserveTransactionActionFactory from './action/transfer/return/reserveTransaction';
 import * as SendEmailMessageActionFactory from './action/transfer/send/message/email';
@@ -273,9 +273,9 @@ export declare namespace action {
          * returnはネームスペース名に使えないのでreturnAction
          */
         namespace returnAction {
+            export import invoice = ReturnInvoiceActionFactory;
             export import moneyTransfer = ReturnMoneyTransferActionFactory;
             export import order = ReturnOrderActionFactory;
-            export import paymentMethod = ReturnPaymentMethodActionFactory;
             export import pointAward = ReturnPointAwardActionFactory;
             export import reserveTransaction = ReturnReserveTransactionActionFactory;
         }

package/lib/index.js

@@ -33,9 +33,9 @@ var PayActionFactory = require("./action/trade/pay");
 var RefundActionFactory = require("./action/trade/refund");
 var GivePointAwardActionFactory = require("./action/transfer/give/pointAward");
 var MoneyTransferActionFactory = require("./action/transfer/moneyTransfer");
+var ReturnInvoiceActionFactory = require("./action/transfer/return/invoice");
 var ReturnMoneyTransferActionFactory = require("./action/transfer/return/moneyTransfer");
 var ReturnOrderActionFactory = require("./action/transfer/return/order");
-var ReturnPaymentMethodActionFactory = require("./action/transfer/return/paymentMethod");
 var ReturnPointAwardActionFactory = require("./action/transfer/return/pointAward");
 var ReturnReserveTransactionActionFactory = require("./action/transfer/return/reserveTransaction");
 var SendEmailMessageActionFactory = require("./action/transfer/send/message/email");
@@ -248,12 +248,12 @@ var action;
          */
         var returnAction;
         (function (returnAction) {
+            // tslint:disable-next-line:no-shadowed-variable
+            returnAction.invoice = ReturnInvoiceActionFactory;
             // tslint:disable-next-line:no-shadowed-variable
             returnAction.moneyTransfer = ReturnMoneyTransferActionFactory;
             // tslint:disable-next-line:no-shadowed-variable
             returnAction.order = ReturnOrderActionFactory;
-            // tslint:disable-next-line:no-shadowed-variable
-            returnAction.paymentMethod = ReturnPaymentMethodActionFactory;
             returnAction.pointAward = ReturnPointAwardActionFactory;
             returnAction.reserveTransaction = ReturnReserveTransactionActionFactory;
         })(returnAction = transfer.returnAction || (transfer.returnAction = {}));

package/lib/task/returnPayTransaction.d.ts

@@ -1,8 +1,8 @@
-import { IAttributes as IReturnActionAttributes } from '../action/transfer/return/paymentMethod';
+import { IPotentialReturnInvoiceAction } from '../action/transfer/return/order';
 import { IExtendId } from '../autoGenerated';
 import * as TaskFactory from '../task';
 import { TaskName } from '../taskName';
-export type IData = IReturnActionAttributes;
+export type IData = IPotentialReturnInvoiceAction;
 export interface IAttributes extends TaskFactory.IAttributes {
     name: TaskName.ReturnPayTransaction;
     data: IData;

package/lib/transaction/placeOrder.d.ts

@@ -156,7 +156,7 @@ export interface IConfirmParams {
      */
     result?: IResultParams;
 }
-export type IOrderAsResult = Pick<OrderFactory.IOrder, 'broker' | 'confirmationNumber' | 'identifier' | 'name' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf' | 'url'>;
+export type IOrderAsResult = Pick<OrderFactory.IOrder, 'confirmationNumber' | 'identifier' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'price' | 'priceCurrency' | 'typeOf' | 'url'>;
 export interface IAuthorizeActionAsResult {
     id: string;
 }

package/lib/transaction.d.ts

@@ -118,10 +118,12 @@ export type IAttributes<TStartParams, TResult, TError, TPotentialActions> = TSta
     tasksExportAction?: ITasksExportAction;
     /**
      * タスクエクスポート日時
+     * @deprecated use tasksExportAction
      */
     tasksExportedAt?: Date;
     /**
      * タスクエクスポート状態
+     * @deprecated use tasksExportAction
      */
     tasksExportationStatus: TransactionTasksExportationStatus;
     /**
@@ -155,8 +157,12 @@ export interface ISearchConditions<T extends TransactionType> {
     ids?: string[];
     /**
      * ステータスリスト
+     * @deprecated use tasksExportAction
      */
     statuses?: TransactionStatusType[];
+    status?: {
+        $in?: TransactionStatusType[];
+    };
     /**
      * 開始日時(から)
      */
@@ -174,18 +180,14 @@ export interface ISearchConditions<T extends TransactionType> {
      */
     endThrough?: Date;
     agent?: {
-        typeOf?: PersonType;
+        typeOf?: PersonType.Person | IWebApplication['typeOf'];
         ids?: string[];
         identifiers?: IIdentifier;
-        givenName?: string;
-        familyName?: string;
-        telephone?: string;
-        email?: string;
     };
-    tasksExportationStatuses?: TransactionTasksExportationStatus[];
     tasksExportAction?: {
         actionStatus?: {
             $eq?: ActionStatusType;
+            $in?: ActionStatusType[];
         };
     };
 }

package/package.json

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