@arbiwallet/contracts 1.0.225 → 1.0.227

package/gen/exchange_core.ts

@@ -12,22 +12,6 @@ import { Struct } from "./google/protobuf/struct";
 
 export const protobufPackage = "exchange_core";
 
-export enum ExchangeDealStatus {
-  EXCHANGE_DEAL_STATUS_UNSPECIFIED = 0,
-  EXCHANGE_DEAL_STATUS_NO_DEAL = 1,
-  EXCHANGE_DEAL_STATUS_IN_PROGRESS = 2,
-  EXCHANGE_DEAL_STATUS_COMPLETED = 3,
-  EXCHANGE_DEAL_STATUS_CANCELLED = 4,
-  UNRECOGNIZED = -1,
-}
-
-export enum ExchangeDealAction {
-  EXCHANGE_DEAL_ACTION_UNSPECIFIED = 0,
-  EXCHANGE_DEAL_ACTION_CREATE_DEAL = 1,
-  EXCHANGE_DEAL_ACTION_OPEN_DEAL = 2,
-  UNRECOGNIZED = -1,
-}
-
 export interface AuthManagerContext {
   managerId: string;
   officeIds: string[];
@@ -48,7 +32,7 @@ export interface CreateExchangeDealRequest {
   factOutputAmount?: number | undefined;
   inputCurrencyId?: string | undefined;
   outputCurrencyId?: string | undefined;
-  customerId?: string | undefined;
+  userId?: string | undefined;
   managerPersonId?: string | undefined;
   expensesForCourier?: number | undefined;
   includeInTotalCalculation?: boolean | undefined;
@@ -65,7 +49,7 @@ export interface CreateExchangeDealRequest {
 
 export interface CreateExchangeDealResult {
   exchangeId: string;
-  customerId: string;
+  userId: string;
   inputAmount: number;
   inputCurrencyId: string;
   outputAmount: number;
@@ -85,7 +69,7 @@ export interface GetExchangeDealsRequest {
   fromDate?: string | undefined;
   toDate?: string | undefined;
   managerId?: string | undefined;
-  customerId?: string | undefined;
+  userId?: string | undefined;
   page?: number | undefined;
   pageSize?: number | undefined;
   ordering?: string | undefined;
@@ -98,7 +82,7 @@ export interface GetExchangeDealsManager {
 
 export interface GetExchangeDealsItem {
   id: string;
-  customerId: string;
+  userId: string;
   paymentId?: string | undefined;
   inputAmount: number;
   inputCurrencyId: string;
@@ -122,7 +106,7 @@ export interface GetExchangeDealsResponse {
 export interface UpdateExchangeDealRequest {
   authManagerContext: AuthManagerContext | undefined;
   id: string;
-  customerId?: string | undefined;
+  userId?: string | undefined;
   inputAmount?: number | undefined;
   inputCurrencyId?: string | undefined;
   inputWalletId?: string | undefined;
@@ -148,7 +132,7 @@ export interface UpdateExchangeDealRequest {
 
 export interface UpdateExchangeDealResult {
   id: string;
-  customerId: string;
+  userId: string;
   inputAmount: number;
   inputCurrencyId: string;
   outputAmount: number;
@@ -206,12 +190,6 @@ export interface GetTransactionsRequest {
   pageSize?: number | undefined;
 }
 
-export interface GetTransactionsSummaryItem {
-  currency: string;
-  totalIncome: number;
-  totalExpense: number;
-}
-
 export interface GetTransactionsItem {
   id: string;
   transactionDatetime: string;
@@ -234,11 +212,31 @@ export interface GetTransactionsItem {
   comment?: string | undefined;
   exchangeId?: string | undefined;
   exchangeUrl?: string | undefined;
-  userId?: string | undefined;
-  username?: string | undefined;
+  managerId?: string | undefined;
+  managerName?: string | undefined;
   accountType: number;
 }
 
+export interface GetTransactionsSummaryRequest {
+  authManagerContext: AuthManagerContext | undefined;
+  startDate?: string | undefined;
+  endDate?: string | undefined;
+  userId?: string | undefined;
+  currencyId?: string | undefined;
+  walletId?: string | undefined;
+  type?: number | undefined;
+  accountType?: number | undefined;
+  categoryId?: string | undefined;
+  businessUnitId?: string | undefined;
+  search?: string | undefined;
+}
+
+export interface GetTransactionsSummaryItem {
+  currency: string;
+  totalIncome: number;
+  totalExpense: number;
+}
+
 export interface GetTransactionsResponse {
   count: number;
   next?: string | undefined;
@@ -247,69 +245,8 @@ export interface GetTransactionsResponse {
   summary: GetTransactionsSummaryItem[];
 }
 
-export interface GetExchangeDealHistoryStatisticsRequest {
-  dateFrom?: string | undefined;
-  dateTo?: string | undefined;
-  amountFrom?: number | undefined;
-  amountTo?: number | undefined;
-  inputCurrency?: string | undefined;
-  outputCurrency?:
-    | string
-    | undefined;
-  /** no_payment | with_payment | with_exchange | completed */
-  status?: string | undefined;
-  search?: string | undefined;
-  page?: number | undefined;
-  pageSize?: number | undefined;
-}
-
-export interface GetExchangeDealHistoryStatisticsResponse {
-  items: ExchangeDealStateByCalculation[];
-}
-
-export interface GetExchangePaymentRefsByCalculationIdsRequest {
-  calculationIds: string[];
-}
-
-export interface ExchangePaymentRefByCalculation {
-  calculationId: string;
-  paymentUuid: string;
-}
-
-export interface GetExchangePaymentRefsByCalculationIdsResponse {
-  items: ExchangePaymentRefByCalculation[];
-  notFoundCalculationIds: string[];
-}
-
-export interface GetExchangeDealRefsByCalculationIdsRequest {
-  calculationIds: string[];
-}
-
-export interface ExchangeDealRefByCalculation {
-  calculationId: string;
-  exchangeId: string;
-  status: boolean;
-}
-
-export interface GetExchangeDealRefsByCalculationIdsResponse {
-  items: ExchangeDealRefByCalculation[];
-  notFoundCalculationIds: string[];
-}
-
-export interface GetExchangeDealStatesByCalculationIdsRequest {
-  calculationIds: string[];
-}
-
-export interface ExchangeDealStateByCalculation {
-  calculationId: string;
-  dealId?: string | undefined;
-  status: ExchangeDealStatus;
-  allowedActions: ExchangeDealAction[];
-}
-
-export interface GetExchangeDealStatesByCalculationIdsResponse {
-  items: ExchangeDealStateByCalculation[];
-  notFoundCalculationIds: string[];
+export interface GetTransactionsSummaryResponse {
+  summary: GetTransactionsSummaryItem[];
 }
 
 export const EXCHANGE_CORE_PACKAGE_NAME = "exchange_core";
@@ -335,21 +272,7 @@ export interface ExchangeCoreServiceClient {
 
   getTransactions(request: GetTransactionsRequest): Observable<GetTransactionsResponse>;
 
-  getExchangeDealHistoryStatistics(
-    request: GetExchangeDealHistoryStatisticsRequest,
-  ): Observable<GetExchangeDealHistoryStatisticsResponse>;
-
-  getExchangePaymentRefsByCalculationIds(
-    request: GetExchangePaymentRefsByCalculationIdsRequest,
-  ): Observable<GetExchangePaymentRefsByCalculationIdsResponse>;
-
-  getExchangeDealRefsByCalculationIds(
-    request: GetExchangeDealRefsByCalculationIdsRequest,
-  ): Observable<GetExchangeDealRefsByCalculationIdsResponse>;
-
-  getExchangeDealStatesByCalculationIds(
-    request: GetExchangeDealStatesByCalculationIdsRequest,
-  ): Observable<GetExchangeDealStatesByCalculationIdsResponse>;
+  getTransactionsSummary(request: GetTransactionsSummaryRequest): Observable<GetTransactionsSummaryResponse>;
 }
 
 /**
@@ -383,33 +306,12 @@ export interface ExchangeCoreServiceController {
     request: GetTransactionsRequest,
   ): Promise<GetTransactionsResponse> | Observable<GetTransactionsResponse> | GetTransactionsResponse;
 
-  getExchangeDealHistoryStatistics(
-    request: GetExchangeDealHistoryStatisticsRequest,
-  ):
-    | Promise<GetExchangeDealHistoryStatisticsResponse>
-    | Observable<GetExchangeDealHistoryStatisticsResponse>
-    | GetExchangeDealHistoryStatisticsResponse;
-
-  getExchangePaymentRefsByCalculationIds(
-    request: GetExchangePaymentRefsByCalculationIdsRequest,
-  ):
-    | Promise<GetExchangePaymentRefsByCalculationIdsResponse>
-    | Observable<GetExchangePaymentRefsByCalculationIdsResponse>
-    | GetExchangePaymentRefsByCalculationIdsResponse;
-
-  getExchangeDealRefsByCalculationIds(
-    request: GetExchangeDealRefsByCalculationIdsRequest,
-  ):
-    | Promise<GetExchangeDealRefsByCalculationIdsResponse>
-    | Observable<GetExchangeDealRefsByCalculationIdsResponse>
-    | GetExchangeDealRefsByCalculationIdsResponse;
-
-  getExchangeDealStatesByCalculationIds(
-    request: GetExchangeDealStatesByCalculationIdsRequest,
+  getTransactionsSummary(
+    request: GetTransactionsSummaryRequest,
   ):
-    | Promise<GetExchangeDealStatesByCalculationIdsResponse>
-    | Observable<GetExchangeDealStatesByCalculationIdsResponse>
-    | GetExchangeDealStatesByCalculationIdsResponse;
+    | Promise<GetTransactionsSummaryResponse>
+    | Observable<GetTransactionsSummaryResponse>
+    | GetTransactionsSummaryResponse;
 }
 
 export function ExchangeCoreServiceControllerMethods() {
@@ -421,10 +323,7 @@ export function ExchangeCoreServiceControllerMethods() {
       "completeExchangeDeal",
       "cancelExchangeDeal",
       "getTransactions",
-      "getExchangeDealHistoryStatistics",
-      "getExchangePaymentRefsByCalculationIds",
-      "getExchangeDealRefsByCalculationIds",
-      "getExchangeDealStatesByCalculationIds",
+      "getTransactionsSummary",
     ];
     for (const method of grpcMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@arbiwallet/contracts",
   "descriptions": "Generate and manage smart contracts for ArbiWallet",
-  "version": "1.0.225",
+  "version": "1.0.227",
   "scripts": {
     "generate": "protoc -I ./proto ./proto/*.proto --ts_proto_out=./gen --ts_proto_opt=nestJs=true,package=omit"
   },

package/proto/exchange_core.proto

@@ -20,13 +20,7 @@ service ExchangeCoreService {
   rpc CancelExchangeDeal(CancelExchangeDealRequest) returns (CancelExchangeDealResponse);
 
   rpc GetTransactions(GetTransactionsRequest) returns (GetTransactionsResponse);
-
-  rpc GetExchangeDealHistoryStatistics(GetExchangeDealHistoryStatisticsRequest) returns (GetExchangeDealHistoryStatisticsResponse);
-
-  
-  rpc GetExchangePaymentRefsByCalculationIds(GetExchangePaymentRefsByCalculationIdsRequest) returns (GetExchangePaymentRefsByCalculationIdsResponse);
-  rpc GetExchangeDealRefsByCalculationIds(GetExchangeDealRefsByCalculationIdsRequest) returns (GetExchangeDealRefsByCalculationIdsResponse);
-  rpc GetExchangeDealStatesByCalculationIds(GetExchangeDealStatesByCalculationIdsRequest) returns (GetExchangeDealStatesByCalculationIdsResponse);
+  rpc GetTransactionsSummary(GetTransactionsSummaryRequest) returns (GetTransactionsSummaryResponse);
 }
 
 // message CreateExchangePaymentRequest {
@@ -36,7 +30,7 @@ service ExchangeCoreService {
 //   optional string calculation_id = 3;
 //   int32 agent_id = 4;
 //   optional double amount = 5;
-//   optional string customer_id = 6;
+//   optional string user_id = 6;
 //   optional string crypto_network = 7;
 //   optional string customer_source = 8;
 //   optional string customer_referrer = 9;
@@ -120,7 +114,7 @@ message CreateExchangeDealRequest {
   optional string input_currency_id = 11;
   optional string output_currency_id = 12;
 
-  optional string customer_id = 13;
+  optional string user_id = 13;
   optional string manager_person_id = 14;
 
   optional double expenses_for_courier = 15;
@@ -141,7 +135,7 @@ message CreateExchangeDealRequest {
 
 message CreateExchangeDealResult {
   string exchange_id = 1;
-  string customer_id = 2;
+  string user_id = 2;
   double input_amount = 3;
   string input_currency_id = 4;
   double output_amount = 5;
@@ -161,7 +155,7 @@ message GetExchangeDealsRequest {
   optional string from_date = 2;
   optional string to_date = 3;
   optional string manager_id = 4;
-  optional string customer_id = 5;
+  optional string user_id = 5;
   optional int32 page = 6;
   optional int32 page_size = 7;
   optional string ordering = 8;
@@ -174,7 +168,7 @@ message GetExchangeDealsManager {
 
 message GetExchangeDealsItem {
   string id = 1;
-  string customer_id = 2;
+  string user_id = 2;
   optional string payment_id = 3;
   double input_amount = 4;
   string input_currency_id = 5;
@@ -199,7 +193,7 @@ message UpdateExchangeDealRequest {
   AuthManagerContext auth_manager_context = 1;
   string id = 2;
 
-  optional string customer_id = 3;
+  optional string user_id = 3;
   optional double input_amount = 4;
   optional string input_currency_id = 5;
   optional string input_wallet_id = 6;
@@ -226,7 +220,7 @@ message UpdateExchangeDealRequest {
 
 message UpdateExchangeDealResult {
   string id = 1;
-  string customer_id = 2;
+  string user_id = 2;
   double input_amount = 3;
   string input_currency_id = 4;
   double output_amount = 5;
@@ -284,12 +278,6 @@ message GetTransactionsRequest {
   optional int32 page_size = 13;
 }
 
-message GetTransactionsSummaryItem {
-  string currency = 1;
-  double total_income = 2;
-  double total_expense = 3;
-}
-
 message GetTransactionsItem {
   string id = 1;
   string transaction_datetime = 2;
@@ -312,11 +300,31 @@ message GetTransactionsItem {
   optional string comment = 19;
   optional string exchange_id = 20;
   optional string exchange_url = 21;
-  optional string user_id = 22;
-  optional string username = 23;
+  optional string manager_id = 22;
+  optional string manager_name = 23;
   int32 account_type = 24;
 }
 
+message GetTransactionsSummaryRequest {
+  AuthManagerContext auth_manager_context = 1;
+  optional string start_date = 2;
+  optional string end_date = 3;
+  optional string user_id = 4;
+  optional string currency_id = 5;
+  optional string wallet_id = 6;
+  optional int32 type = 7;
+  optional int32 account_type = 8;
+  optional string category_id = 9;
+  optional string business_unit_id = 10;
+  optional string search = 11;
+}
+
+message GetTransactionsSummaryItem {
+  string currency = 1;
+  double total_income = 2;
+  double total_expense = 3;
+}
+
 message GetTransactionsResponse {
   int32 count = 1;
   optional string next = 2;
@@ -325,79 +333,6 @@ message GetTransactionsResponse {
   repeated GetTransactionsSummaryItem summary = 5;
 }
 
-message GetExchangeDealHistoryStatisticsRequest {
-  optional string date_from = 1;
-  optional string date_to = 2;
-  optional double amount_from = 3;
-  optional double amount_to = 4;
-  optional string input_currency = 5;
-  optional string output_currency = 6;
-  optional string status = 7; // no_payment | with_payment | with_exchange | completed
-  optional string search = 8;
-  optional int32 page = 9;
-  optional int32 page_size = 10;
-}
-
-message GetExchangeDealHistoryStatisticsResponse {
-  repeated ExchangeDealStateByCalculation items = 1;
-}
-
-message GetExchangePaymentRefsByCalculationIdsRequest {
-  repeated string calculation_ids = 1;
-}
-
-message ExchangePaymentRefByCalculation {
-  string calculation_id = 1;
-  string payment_uuid = 2;
-}
-
-message GetExchangePaymentRefsByCalculationIdsResponse {
-  repeated ExchangePaymentRefByCalculation items = 1;
-  repeated string not_found_calculation_ids = 2;
-}
-
-message GetExchangeDealRefsByCalculationIdsRequest {
-  repeated string calculation_ids = 1;
-}
-
-message ExchangeDealRefByCalculation {
-  string calculation_id = 1;
-  string exchange_id = 2;
-  bool status = 3;
-}
-
-message GetExchangeDealRefsByCalculationIdsResponse {
-  repeated ExchangeDealRefByCalculation items = 1;
-  repeated string not_found_calculation_ids = 2;
-}
-
-
-message GetExchangeDealStatesByCalculationIdsRequest {
-  repeated string calculation_ids = 1;
-}
-
-enum ExchangeDealStatus {
-  EXCHANGE_DEAL_STATUS_UNSPECIFIED = 0;
-  EXCHANGE_DEAL_STATUS_NO_DEAL = 1;
-  EXCHANGE_DEAL_STATUS_IN_PROGRESS = 2;
-  EXCHANGE_DEAL_STATUS_COMPLETED = 3;
-  EXCHANGE_DEAL_STATUS_CANCELLED = 4;
-}
-
-enum ExchangeDealAction {
-  EXCHANGE_DEAL_ACTION_UNSPECIFIED = 0;
-  EXCHANGE_DEAL_ACTION_CREATE_DEAL = 1;
-  EXCHANGE_DEAL_ACTION_OPEN_DEAL = 2;
-}
-
-message ExchangeDealStateByCalculation {
-  string calculation_id = 1;
-  optional string deal_id = 2;
-  ExchangeDealStatus status = 3;
-  repeated ExchangeDealAction allowed_actions = 4;
-}
-
-message GetExchangeDealStatesByCalculationIdsResponse {
-  repeated ExchangeDealStateByCalculation items = 1;
-  repeated string not_found_calculation_ids = 2;
+message GetTransactionsSummaryResponse {
+  repeated GetTransactionsSummaryItem summary = 1;
 }