@chevre/factory 4.223.0 → 4.226.0

package/lib/chevre.d.ts

@@ -442,6 +442,8 @@ export declare namespace assetTransaction {
     export import reserve = ReserveAssetTransactionFactory;
 }
 export declare namespace transaction {
+    export import IAgentProfile = TransactionFactory.IAgentProfile;
+    export import IAgent = TransactionFactory.IAgent;
     export import IPassportBeforeStart = TransactionFactory.IPassportBeforeStart;
     export import ISendEmailMessageParams = TransactionFactory.ISendEmailMessageParams;
     export import ISortOrder = TransactionFactory.ISortOrder;

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

@@ -3,16 +3,17 @@ import { ActionType } from '../../actionType';
 import { AssetTransactionType } from '../../assetTransactionType';
 import { IReservation as IEventReservation } from '../../reservation/event';
 import { IAttributes as IInformActionAttributes } from '../interact/inform';
+export declare type IAgent = ActionFactory.IParticipantAsProject;
 /**
- * 予約キャンセル対象インターフェース
+ * 予約キャンセル対象
  */
 export declare type IObject = IEventReservation;
 /**
- * 予約キャンセル結果インターフェース
+ * 予約キャンセル結果
  */
 export declare type IResult = any;
 /**
- * 予約キャンセル目的インターフェース
+ * 予約キャンセル目的
  */
 export interface IPurpose {
     /**
@@ -28,13 +29,14 @@ export declare type IInformReservation = IInformActionAttributes<IObject, any>;
 export interface IPotentialActions {
 }
 /**
- * アクション属性インターフェース
+ * アクション属性
  */
 export interface IAttributes extends ActionFactory.IAttributes<ActionType.CancelAction, IObject, IResult> {
+    agent: IAgent;
     potentialActions?: IPotentialActions;
     purpose: IPurpose;
 }
 /**
- * 予約キャンセルアクションインターフェース
+ * 予約キャンセルアクション
  */
 export declare type IAction = ActionFactory.IAction<IAttributes>;

package/lib/factory/action/interact/register/service.d.ts

@@ -1,15 +1,18 @@
+import { IParticipantAsProject } from '../../../action';
 import { IPermit } from '../../../permit';
 import { IAttributes as IMoneyTransferActionAttributes } from '../../transfer/moneyTransfer';
 import * as RegisterActionFactory from '../register';
+export declare type IAgent = IParticipantAsProject;
 export declare type IObject = IPermit;
 export declare type IResult = any;
 export interface IPotentialActions {
     moneyTransfer: IMoneyTransferActionAttributes[];
 }
 export interface IAttributes extends RegisterActionFactory.IAttributes<IObject, IResult> {
+    agent: IAgent;
     potentialActions?: IPotentialActions;
 }
 /**
- * サービス登録アクションインターフェース
+ * サービス登録アクション
  */
 export declare type IAction = RegisterActionFactory.IAction<IAttributes>;

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

@@ -5,6 +5,7 @@ import { OrderType } from '../order';
 import { IReservation as IEventReservation } from '../reservation/event';
 import { IAttributes as IInformActionAttributes } from './interact/inform';
 import { IAttributes as IMoneyTransferActionAttributes } from './transfer/moneyTransfer';
+export declare type IAgent = ActionFactory.IParticipantAsProject;
 /**
  * 予約対象
  */
@@ -37,6 +38,7 @@ export interface IPotentialActions {
  * アクション属性
  */
 export interface IAttributes extends ActionFactory.IAttributes<ActionType.ReserveAction, IObject, IResult> {
+    agent: IAgent;
     potentialActions?: IPotentialActions;
     purpose: IPurpose;
 }

package/lib/factory/action/transfer/moneyTransfer.d.ts

@@ -5,7 +5,7 @@ import * as MoneyTransferTransactionFactory from '../../assetTransaction/moneyTr
 import { AssetTransactionType } from '../../assetTransactionType';
 import { IMonetaryAmount } from '../../monetaryAmount';
 /**
- * 進行中取引インターフェース
+ * 進行中取引
  */
 export interface IPendingTransaction {
     typeOf: AccountFactory.transactionType;
@@ -16,11 +16,11 @@ export interface IPendingTransaction {
 export declare type IAgent = ActionFactory.IParticipant;
 export declare type IRecipient = ActionFactory.IParticipant;
 /**
- * 匿名ロケーションインターフェース
+ * 匿名ロケーション
  */
 export import IAnonymousLocation = AccountFactory.action.moneyTransfer.IAnonymousLocation;
 /**
- * ペイメントカードインターフェース
+ * ペイメントカード
  */
 export import IPaymentCard = MoneyTransferTransactionFactory.IPaymentCard;
 /**
@@ -45,6 +45,8 @@ export interface ITransactionPurpose {
 export declare type IPurpose = ITransactionPurpose;
 export interface IAttributes extends ActionFactory.IAttributes<ActionType.MoneyTransfer, IObject, IResult> {
     typeOf: ActionType.MoneyTransfer;
+    agent: IAgent;
+    recipient: IRecipient;
     purpose: IPurpose;
     /**
      * 金額

package/lib/factory/action.d.ts

@@ -1,18 +1,32 @@
 import { ActionStatusType } from './actionStatusType';
 import { ActionType } from './actionType';
 import { IExtendId } from './autoGenerated';
-import { ICreativeWork as IWebApplication } from './creativeWork/softwareApplication/webApplication';
+import { CreativeWorkType } from './creativeWorkType';
 import { ICustomer } from './customer';
 import { IMultilingualString } from './multilingualString';
-import { IPerson } from './person';
+import { OrganizationType } from './organizationType';
+import { IPersonAttributes } from './person';
 import { IProject } from './project';
 import { IPropertyValue } from './propertyValue';
 import { ISeller } from './seller';
 import { SortType } from './sortType';
-export declare type IParticipantAsWebApplication = Omit<IWebApplication, 'additionalProperty'>;
-export declare type IParticipantAsPerson = Omit<IPerson, 'email' | 'telephone' | 'givenName' | 'familyName' | 'additionalProperty'>;
+export interface IParticipantAsWebApplication {
+    typeOf: CreativeWorkType.WebApplication;
+    id: string;
+    name?: string;
+    url?: string;
+}
+export declare type IParticipantAsPerson = IPersonAttributes & {
+    name?: string;
+    url?: string;
+};
 export declare type IParticipantAsSeller = Omit<ISeller, 'branchCode' | 'paymentAccepted' | 'project' | 'additionalProperty' | 'hasMerchantReturnPolicy' | 'email' | 'telephone' | 'location'>;
-export declare type IParticipantAsProject = Omit<IProject, 'settings' | 'subscription' | 'alternateName' | 'description' | 'additionalProperty'>;
+export interface IParticipantAsProject {
+    typeOf: OrganizationType.Project;
+    id: string;
+    name?: string;
+    url?: string;
+}
 export declare type IParticipantAsCustomer = Omit<ICustomer, 'name' | 'branchCode' | 'contactPoint' | 'project' | 'additionalProperty'> & {
     name?: string | IMultilingualString;
 };

package/lib/factory/assetTransaction/registerService.d.ts

@@ -5,6 +5,7 @@ import { AssetTransactionType } from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
 import { OfferType } from '../offerType';
 import { IProduct, IServiceOutput } from '../product';
+import { IUnderNameType } from '../reservation';
 export declare type IStartParamsWithoutDetail = TransactionFactory.IStartParams<AssetTransactionType.RegisterService, IAgent, undefined, IObjectWithoutDetail>;
 /**
  * 取引開始パラメーターインターフェース
@@ -12,7 +13,7 @@ export declare type IStartParamsWithoutDetail = TransactionFactory.IStartParams<
  */
 export declare type IStartParams = TransactionFactory.IStartParams<AssetTransactionType.RegisterService, IAgent, undefined, IObject>;
 export interface IAgent {
-    typeOf: string;
+    typeOf: IUnderNameType;
     id?: string;
     name: string;
     url?: string;

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

@@ -17,7 +17,7 @@ export declare type IStartParamsWithoutDetail = TransactionFactory.IStartParams<
  */
 export declare type IStartParams = TransactionFactory.IStartParams<AssetTransactionType.Reserve, IAgent, undefined, IObject>;
 export interface IAgent {
-    typeOf: string;
+    typeOf: ReservationFactory.IUnderNameType;
     id?: string;
     name: string;
     url?: string;

package/lib/factory/person.d.ts

@@ -9,7 +9,7 @@ export declare type IAdditionalProperty = IPropertyValue<string>[];
 export import IIdentifier = ThingFactory.IIdentifier;
 export declare type IMemberOf = IProgramMembership;
 /**
- * プロフィールインターフェース
+ * プロフィール
  */
 export interface IProfile extends ThingFactory.IThing {
     /**
@@ -38,15 +38,13 @@ export interface IProfile extends ThingFactory.IThing {
      * Gender of the person.
      */
     gender?: string;
+    name?: string;
     /**
      * The telephone number.
      */
     telephone?: string;
 }
-/**
- * 人物インターフェース
- */
-export declare type IPerson = IProfile & {
+export interface IPersonAttributes {
     /**
      * Person ID (Amazon Cognito User Identifier)
      */
@@ -56,4 +54,8 @@ export declare type IPerson = IProfile & {
      */
     memberOf?: IMemberOf;
     typeOf: PersonType;
-};
+}
+/**
+ * 人物
+ */
+export declare type IPerson = IProfile & IPersonAttributes;

package/lib/factory/project.d.ts

@@ -10,7 +10,6 @@ export interface IInformParams {
      */
     recipient?: {
         id?: string;
-        typeOf?: any;
         name?: string;
         url?: string;
     };
@@ -19,7 +18,7 @@ export interface IOnPaymentStatusChanged {
     informPayment?: IInformParams[];
 }
 /**
- * 予約使用時イベントインターフェース
+ * 予約使用時イベント
  */
 export interface IOnReservationUsed {
     informAction?: IInformParams[];
@@ -27,7 +26,7 @@ export interface IOnReservationUsed {
 export interface ICognitoSettings {
 }
 /**
- * 注文ステータス変更時イベントインターフェース
+ * 注文ステータス変更時イベント
  */
 export interface IOnOrderStatusChanged {
     informOrder?: IInformParams[];
@@ -43,7 +42,7 @@ export interface IWebhookSettings {
     timeout?: number;
 }
 /**
- * プロジェクト設定インターフェース
+ * プロジェクト設定
  */
 export interface ISettings {
     importEventsInWeeks?: number;
@@ -58,7 +57,7 @@ export interface ISettings {
     useUsernameAsGMOMemberId?: boolean;
 }
 /**
- * プロジェクトインターフェース
+ * プロジェクト
  */
 export interface IProject extends IOrganization {
     typeOf: OrganizationType.Project;
@@ -72,13 +71,13 @@ export interface IProject extends IOrganization {
     };
 }
 /**
- * ソート条件インターフェース
+ * ソート条件
  */
 export interface ISortOrder {
     _id?: SortType;
 }
 /**
- * プロジェクト検索条件インターフェース
+ * プロジェクト検索条件
  */
 export interface ISearchConditions {
     limit?: number;

package/lib/factory/reservation.d.ts

@@ -1,8 +1,11 @@
 import * 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 { IPermit } from './permit';
+import { PersonType } from './personType';
 import * as SeatFactory from './place/seat';
 import { PlaceType } from './placeType';
 import { PriceCurrency } from './priceCurrency';
@@ -32,11 +35,12 @@ export interface ITicketType {
 }
 export declare type IPriceSpecification = IGenericPriceSpecification<PriceSpecificationType>;
 export declare type ISeatingType = SeatFactory.ISeatingType;
+export declare type IUnderNameType = CreativeWorkType.WebApplication | PersonType.Person | OrganizationType.Organization | OrganizationType.Corporation | OrganizationType.Project;
 /**
  * under name interface
  */
 export interface IUnderName {
-    typeOf: string;
+    typeOf: IUnderNameType;
     name: string;
     additionalName?: string;
     address?: string;

package/lib/factory/task/orderProgramMembership.d.ts

@@ -2,7 +2,7 @@ import { ActionType } from '../actionType';
 import { IExtendId } from '../autoGenerated';
 import { OfferType } from '../offerType';
 import { PermitType } from '../permit';
-import { IAdditionalProperty, IIdentifier } from '../person';
+import { IIdentifier } from '../person';
 import { PersonType } from '../personType';
 import { ProductType } from '../product';
 import { IProject } from '../project';
@@ -12,7 +12,6 @@ import { IPotentialActionsParams as IOrderPotentialActionsParams } from '../tran
 export interface IAgent {
     typeOf: PersonType.Person;
     id: string;
-    additionalProperty?: IAdditionalProperty;
     identifier: IIdentifier;
 }
 export interface IAcceptedOffer {

package/lib/factory/task.d.ts

@@ -5,14 +5,14 @@ import { TaskName } from './taskName';
 import { TaskStatus } from './taskStatus';
 export declare type IData = any;
 /**
- * タスク実行結果インターフェース
+ * タスク実行結果
  */
 export interface IExecutionResult {
     executedAt: Date;
     error: any;
 }
 /**
- * タスクインターフェース
+ * タスク
  */
 export declare type ITask = IExtendId<IAttributes>;
 export interface IAttributes {
@@ -52,13 +52,28 @@ export interface IAttributes {
     data: IData;
 }
 /**
- * ソート条件インターフェース
+ * ソート条件
  */
 export interface ISortOrder {
     runsAt?: SortType;
 }
+export interface IDataSearchConditions {
+    object?: {
+        transactionNumber?: {
+            $eq?: string;
+        };
+    };
+    purpose?: {
+        id?: {
+            $eq?: string;
+        };
+        orderNumber?: {
+            $eq?: string;
+        };
+    };
+}
 /**
- * タスク検索条件インターフェース
+ * タスク検索条件
  */
 export interface ISearchConditions<T extends TaskName | string> {
     limit?: number;
@@ -75,4 +90,5 @@ export interface ISearchConditions<T extends TaskName | string> {
     runsThrough?: Date;
     lastTriedFrom?: Date;
     lastTriedThrough?: Date;
+    data?: IDataSearchConditions;
 }

package/lib/factory/transaction/placeOrder.d.ts

@@ -12,9 +12,10 @@ import * as WebAPIFactory from '../service/webAPI';
 import * as TransactionFactory from '../transaction';
 import { TransactionType } from '../transactionType';
 /**
- * 取引人インターフェース
+ * 取引人
  */
 export declare type IAgent = TransactionFactory.IAgent;
+export declare type ICustomer = OrderFactory.ICustomer;
 export interface IPaymentMethodByPaymentUrl {
     /**
      * 決済方法区分
@@ -30,7 +31,7 @@ export interface IPaymentMethodByPaymentUrl {
     };
 }
 /**
- * 注文特典口座インターフェース
+ * 注文特典口座
  */
 export interface IAwardAccount {
     typeOf: AccountType.Account;
@@ -39,7 +40,7 @@ export interface IAwardAccount {
 export interface IObject {
     clientUser?: IClientUser;
     broker?: OrderFactory.IBroker;
-    customer?: OrderFactory.ICustomer;
+    customer?: ICustomer;
     identifier?: OrderFactory.IIdentifier;
     /**
      * 確認番号
@@ -82,7 +83,7 @@ export interface IStartParamsWithoutDetail {
     };
     object: {
         clientUser?: IClientUser;
-        customer?: OrderFactory.ICustomer;
+        customer?: ICustomer;
         passport?: TransactionFactory.IPassportBeforeStart;
         /**
          * 注文名称
@@ -94,7 +95,7 @@ export interface ISeller extends TransactionFactory.ISeller {
     id: string;
 }
 /**
- * 取引開始パラメーターインターフェース
+ * 取引開始パラメーター
  */
 export interface IStartParams extends TransactionFactory.IStartParams<TransactionType.PlaceOrder, IAgent, undefined, IObject> {
     /**
@@ -176,30 +177,27 @@ export interface IConfirmParams {
     result?: IResultParams;
 }
 /**
- * 取引結果インターフェース
+ * 取引結果
  */
 export interface IResult {
     /**
-     * 注文データ
+     * 注文
      */
     order: OrderFactory.IOrder;
 }
 /**
- * エラーインターフェース
+ * エラー
  */
 export declare type IError = any;
 export interface IPotentialActions {
     order: IOrderActionAttributes;
 }
+export interface IAttributes extends TransactionFactory.IAttributes<IStartParams, IResult, IError, IPotentialActions> {
+}
 /**
- * 注文取引インターフェース
+ * 注文取引
  */
 export declare type ITransaction = IExtendId<IAttributes>;
-/**
- * 注文取引インターフェース
- */
-export interface IAttributes extends TransactionFactory.IAttributes<IStartParams, IResult, IError, IPotentialActions> {
-}
 export interface ISearchConditions extends TransactionFactory.ISearchConditions<TransactionType.PlaceOrder> {
     seller?: {
         ids?: string[];

package/lib/factory/transaction.d.ts

@@ -10,10 +10,13 @@ import { SortType } from './sortType';
 import { TransactionStatusType } from './transactionStatusType';
 import { TransactionTasksExportationStatus } from './transactionTasksExportationStatus';
 import { TransactionType } from './transactionType';
-export declare type IWebApplicationAgent = IWebApplication & PersonFactory.IProfile;
-export declare type IAgent = IWebApplicationAgent | PersonFactory.IPerson;
+export declare type IOmittedProfileAttributes = 'email' | 'telephone' | 'familyName' | 'givenName' | 'age' | 'address' | 'gender' | 'additionalProperty' | 'url';
+export declare type IAgentProfile = Omit<PersonFactory.IProfile, IOmittedProfileAttributes>;
+export declare type IWebApplicationAgent = IWebApplication & IAgentProfile;
+export declare type IPersonAgent = PersonFactory.IPerson;
+export declare type IAgent = Omit<IWebApplicationAgent | PersonFactory.IPerson, IOmittedProfileAttributes>;
 /**
- * 販売者インターフェース
+ * 販売者
  * 最適化(2022-05-20~)
  */
 export declare type ISeller = Omit<SellerFactory.ISeller, 'branchCode' | 'paymentAccepted' | 'additionalProperty' | 'hasMerchantReturnPolicy' | 'email' | 'telephone' | 'location' | 'url' | 'project'>;
@@ -44,7 +47,7 @@ export interface IPassportBeforeStart {
     secret: string;
 }
 /**
- * 取引開始パラメーターインターフェース
+ * 取引開始パラメータ
  */
 export interface IStartParams<T extends TransactionType, TAgent, TRecipient, TObject> {
     project: IProject;
@@ -69,10 +72,6 @@ export interface IStartParams<T extends TransactionType, TAgent, TRecipient, TOb
      */
     expires: Date;
 }
-export declare type ITransaction<TStartParams, TResult, TError, TPotentialActions> = IExtendId<IAttributes<TStartParams, TResult, TError, TPotentialActions>>;
-/**
- * 取引インターフェース
- */
 export declare type IAttributes<TStartParams, TResult, TError, TPotentialActions> = TStartParams & {
     /**
      * 取引状態
@@ -111,8 +110,9 @@ export declare type IAttributes<TStartParams, TResult, TError, TPotentialActions
      */
     potentialActions?: TPotentialActions;
 };
+export declare type ITransaction<TStartParams, TResult, TError, TPotentialActions> = IExtendId<IAttributes<TStartParams, TResult, TError, TPotentialActions>>;
 /**
- * ソート条件インターフェース
+ * ソート条件
  */
 export interface ISortOrder {
     startDate?: SortType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chevre/factory",
-  "version": "4.223.0",
+  "version": "4.226.0",
   "description": "Chevre Factory Library for Javascript",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -60,7 +60,7 @@
     "typescript": "^4.3.2"
   },
   "dependencies": {
-    "@motionpicture/coa-service": "^9.0.0",
+    "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "^5.0.0",
     "@surfrock/sdk": "1.1.0",
     "@waiter/factory": "2.1.0",