From 3d62e735731003575a5fbd2490b1361007fbcff7 Mon Sep 17 00:00:00 2001
From: Tetsu Yamazaki <yamazaki@motionpicture.jp>
Date: Sat, 15 Jun 2024 14:47:29 +0900
Subject: [PATCH] extend assetTransaction.ISearchConditions extend
 transaction.ISearchConditions

---
 CHANGELOG.md            |  2 ++
 src/assetTransaction.ts | 14 +++++++++++++-
 src/transaction.ts      | 23 ++++++++++++++++-------
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a14e3dfd..e2a1241b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ### Changed
 
 - optimize placeOrder.result
+- extend assetTransaction.ISearchConditions
+- extend transaction.ISearchConditions
 
 ### Deprecated
 
diff --git a/src/assetTransaction.ts b/src/assetTransaction.ts
index e8456843..b1a42c67 100644
--- a/src/assetTransaction.ts
+++ b/src/assetTransaction.ts
@@ -106,10 +106,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,11 @@ export interface ISearchConditions<T extends AssetTransactionType> {
         $eq?: string;
         $in?: string[];
     };
-    tasksExportationStatuses?: TransactionTasksExportationStatus[];
+    // tasksExportationStatuses?: TransactionTasksExportationStatus[]; // discontinue(2024-06-17~)
+    tasksExportAction?: {
+        actionStatus?: {
+            $eq?: ActionStatusType;
+            $in?: ActionStatusType[];
+        };
+    };
 }
diff --git a/src/transaction.ts b/src/transaction.ts
index 7e03fbc2..ee4e9cb0 100644
--- a/src/transaction.ts
+++ b/src/transaction.ts
@@ -122,10 +122,12 @@ export type IAttributes<TStartParams, TResult, TError, TPotentialActions> = TSta
     tasksExportAction?: ITasksExportAction;
     /**
      * タスクエクスポート日時
+     * @deprecated use tasksExportAction
      */
     tasksExportedAt?: Date;
     /**
      * タスクエクスポート状態
+     * @deprecated use tasksExportAction
      */
     tasksExportationStatus: TransactionTasksExportationStatus;
     /**
@@ -158,8 +160,12 @@ export interface ISearchConditions<T extends TransactionType> {
     ids?: string[];
     /**
      * ステータスリスト
+     * @deprecated use tasksExportAction
      */
     statuses?: TransactionStatusType[];
+    status?: {
+        $in?: TransactionStatusType[];
+    };
     /**
      * 開始日時(から)
      */
@@ -177,16 +183,19 @@ 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;
+        // givenName?: string; // discontinue(2024-06-17~)
+        // familyName?: string; // discontinue(2024-06-17~)
+        // telephone?: string; // discontinue(2024-06-17~)
+        // email?: string; // discontinue(2024-06-17~)
     };
-    tasksExportationStatuses?: TransactionTasksExportationStatus[];
+    // tasksExportationStatuses?: TransactionTasksExportationStatus[]; // discontinue(2024-06-17~)
     tasksExportAction?: {
-        actionStatus?: { $eq?: ActionStatusType };
+        actionStatus?: {
+            $eq?: ActionStatusType;
+            $in?: ActionStatusType[];
+        };
     };
 }