@chevre/factory 4.377.0-alpha.0 → 4.377.0-alpha.2

package/lib/action/cancel/reservation.d.ts

@@ -35,9 +35,6 @@ export interface IBusReservationAsObject {
     reservationStatus: IAvailableReservationStatusType;
     typeOf: ReservationType.BusReservation;
 }
-/**
- * 予約取消対象
- */
 export interface IEventReservationAsObject {
     id: string;
     issuedThrough?: {
@@ -55,27 +52,19 @@ export interface IEventReservationAsObject {
     typeOf: ReservationType.EventReservation;
 }
 export type IObject = IBusReservationAsObject | IEventReservationAsObject | IReservationPackageAsObject;
-/**
- * 予約取消結果
- */
-export type IResult = any;
-/**
- * 予約取消目的
- */
+export interface IResult {
+}
 export interface IPurpose {
     /**
      * 取引タイプ
      */
-    typeOf: AssetTransactionType;
+    typeOf: AssetTransactionType.Reserve | AssetTransactionType.CancelReservation;
     /**
      * 取引ID
      */
     id: string;
 }
-/**
- * アクション属性
- */
-export interface IAttributes extends ActionFactory.IAttributes<ActionType.CancelAction, IObject, IResult> {
+export interface IAttributes extends Pick<ActionFactory.IAttributes<ActionType.CancelAction, IObject, IResult>, 'typeOf' | 'result' | 'purpose' | 'project' | 'object' | 'agent'> {
     agent: IAgent;
     purpose: IPurpose;
 }

package/lib/assetTransaction/cancelReservation.d.ts

@@ -58,8 +58,14 @@ export interface IObject extends Pick<IReservationPackage, 'reservationNumber' |
 export interface IConfirmParams {
     id: string;
 }
+export interface IPotentialCancelAction extends ICancelReservationActionAttributes {
+    purpose: {
+        id: string;
+        typeOf: AssetTransactionType.CancelReservation;
+    };
+}
 export interface IPotentialActions {
-    cancelReservation: ICancelReservationActionAttributes[];
+    cancelReservation: IPotentialCancelAction[];
 }
 export type ITransaction = IExtendId<IAttributes>;
 /**

package/lib/assetTransaction/reserve.d.ts

@@ -1,4 +1,3 @@
-import * as ReserveActionFactory from '../action/reserve';
 import { IPointAward } from '../action/transfer/moneyTransfer';
 import { ActionType } from '../actionType';
 import * as AssetTransactionFactory from '../assetTransaction';
@@ -10,6 +9,7 @@ import * as ReservationFactory from '../reservation';
 import { IIssuedThrough as IBusReservationIssuedThrough, IReservation as IBusReservation, IReservationFor as IBusReservationReservationFor } from '../reservation/busReservation';
 import { IIssuedThrough as IEventReservationIssuedThrough, IReservation as IEventReservation, IReservationFor as IEventReservationReservationFor, ISubReservation as ISubReservation4eventReservation } from '../reservation/event';
 import { IReservation as IReservationPackage } from '../reservation/reservationPackage';
+import { ReservationStatusType } from '../reservationStatusType';
 import { ReservationType } from '../reservationType';
 import { IUnitPriceOffer } from '../unitPriceOffer';
 export import IAgent = AssetTransactionFactory.IAgent;
@@ -245,6 +245,7 @@ export interface IObject extends Pick<IReservationPackage, 'broker' | 'provider'
      * 予約番号
      */
     reservationNumber: string;
+    reservationStatus: ReservationStatusType.ReservationPending;
     subReservation?: IObjectSubReservation[];
     /**
      * trueで固定(2023-07-19~)
@@ -253,7 +254,6 @@ export interface IObject extends Pick<IReservationPackage, 'broker' | 'provider'
     useHoldStockByTransactionNumber?: boolean;
 }
 export interface IPotentialActions {
-    reserve: ReserveActionFactory.IAttributes[];
 }
 export interface IAttributes extends AssetTransactionFactory.IAttributes<IStartParams, IResult, IError, IPotentialActions> {
 }

package/lib/task/cancelPendingReservation.d.ts

@@ -1,15 +1,19 @@
-/**
- * 仮予約キャンセルタスクファクトリー
- */
-import { IAttributes as ICancelReservationActionAttributes } from '../action/cancel/reservation';
+import { IPurpose } from '../action/cancel/reservation';
+import { AssetTransactionType } from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
 import * as TaskFactory from '../task';
 import { TaskName } from '../taskName';
+export interface ICancelPurpose extends IPurpose {
+    typeOf: AssetTransactionType.Reserve;
+}
 export interface IData {
-    actionAttributes: ICancelReservationActionAttributes[];
+    purpose: ICancelPurpose;
 }
 export interface IAttributes extends TaskFactory.IAttributes {
     name: TaskName.CancelPendingReservation;
     data: IData;
 }
+/**
+ * 保留予約取消タスク
+ */
 export type ITask = IExtendId<IAttributes>;

package/lib/task/cancelReservation.d.ts

@@ -1,15 +1,22 @@
-/**
- * 予約キャンセルタスクファクトリー
- */
 import { IAttributes as ICancelReservationActionAttributes } from '../action/cancel/reservation';
+import { AssetTransactionType } from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
 import * as TaskFactory from '../task';
 import { TaskName } from '../taskName';
+export interface IPotentialCancelAction extends ICancelReservationActionAttributes {
+    purpose: {
+        id: string;
+        typeOf: AssetTransactionType.CancelReservation;
+    };
+}
 export interface IData {
-    actionAttributes: ICancelReservationActionAttributes[];
+    actionAttributes: IPotentialCancelAction[];
 }
 export interface IAttributes extends TaskFactory.IAttributes {
     name: TaskName.CancelReservation;
     data: IData;
 }
+/**
+ * 予約取消タスク
+ */
 export type ITask = IExtendId<IAttributes>;

package/lib/task/reserve.d.ts

@@ -8,9 +8,7 @@ export interface IPotentialReserveAction {
      */
     object: Pick<IObject, 'reservationNumber'>;
 }
-export interface IData {
-    actionAttributes: IPotentialReserveAction[];
-}
+export type IData = IPotentialReserveAction;
 export interface IAttributes extends TaskFactory.IAttributes {
     name: TaskName.Reserve;
     data: IData;

package/package.json

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