@arbiwallet/contracts 1.0.243 → 1.0.245

package/gen/exchange_core.ts

@@ -99,6 +99,65 @@ export interface GetExchangeDealsResponse {
   results: GetExchangeDealsItem[];
 }
 
+export interface GetExchangeDealDetailsRequest {
+  authManagerContext: AuthManagerContext | undefined;
+  id: string;
+}
+
+export interface GetExchangeDealDetailsResult {
+  id: string;
+  userId: string;
+  customerId: string;
+  customerFullName: string;
+  customerChatLink?: string | undefined;
+  customerUrl?: string | undefined;
+  referrerId?: string | undefined;
+  referrerFullName?: string | undefined;
+  referrerUrl?: string | undefined;
+  referrerPercent?: number | undefined;
+  createdAt: string;
+  inputAmount: number;
+  inputCurrencyId: string;
+  inputCurrencyShortName?: string | undefined;
+  inputWalletId: string;
+  inputWalletName?: string | undefined;
+  methodId: string;
+  methodName?: string | undefined;
+  outputAmount: number;
+  outputCurrencyId: string;
+  outputCurrencyShortName?: string | undefined;
+  outputWalletId: string;
+  outputWalletName?: string | undefined;
+  oneCurrencyExchange: boolean;
+  receivedFromDealer: boolean;
+  receivedFromDealerWalletId?: string | undefined;
+  receivedFromDealerWalletName?: string | undefined;
+  exchangeStatusId?: string | undefined;
+  exchangeStatusName?: string | undefined;
+  payed: boolean;
+  buyPrice?: number | undefined;
+  sellPrice?: number | undefined;
+  profitPercent?: number | undefined;
+  profit?: number | undefined;
+  profitCurrencyId?: string | undefined;
+  profitCurrencyShortName?: string | undefined;
+  usdtRate?: number | undefined;
+  usdtProfit?: number | undefined;
+  profitAccounting: boolean;
+  profitDate?: string | undefined;
+  expensesCurrencyId?: string | undefined;
+  expensesCurrencyShortName?: string | undefined;
+  expensesForCourier?: number | undefined;
+  expensesForReferrer?: number | undefined;
+}
+
+export interface GetExchangeDealDetailsResponse {
+  ok: boolean;
+  result?: GetExchangeDealDetailsResult | undefined;
+  error?: string | undefined;
+  validationErrors?: { [key: string]: any } | undefined;
+}
+
 export interface UpdateExchangeDealRequest {
   authManagerContext: AuthManagerContext | undefined;
   id: string;
@@ -483,6 +542,8 @@ export interface ExchangeCoreServiceClient {
 
   getExchangeDeals(request: GetExchangeDealsRequest): Observable<GetExchangeDealsResponse>;
 
+  getExchangeDealDetails(request: GetExchangeDealDetailsRequest): Observable<GetExchangeDealDetailsResponse>;
+
   updateExchangeDeal(request: UpdateExchangeDealRequest): Observable<UpdateExchangeDealResponse>;
 
   completeExchangeDeal(request: CompleteExchangeDealRequest): Observable<CompleteExchangeDealResponse>;
@@ -521,6 +582,13 @@ export interface ExchangeCoreServiceController {
     request: GetExchangeDealsRequest,
   ): Promise<GetExchangeDealsResponse> | Observable<GetExchangeDealsResponse> | GetExchangeDealsResponse;
 
+  getExchangeDealDetails(
+    request: GetExchangeDealDetailsRequest,
+  ):
+    | Promise<GetExchangeDealDetailsResponse>
+    | Observable<GetExchangeDealDetailsResponse>
+    | GetExchangeDealDetailsResponse;
+
   updateExchangeDeal(
     request: UpdateExchangeDealRequest,
   ): Promise<UpdateExchangeDealResponse> | Observable<UpdateExchangeDealResponse> | UpdateExchangeDealResponse;
@@ -586,6 +654,7 @@ export function ExchangeCoreServiceControllerMethods() {
     const grpcMethods: string[] = [
       "createExchangeDeal",
       "getExchangeDeals",
+      "getExchangeDealDetails",
       "updateExchangeDeal",
       "completeExchangeDeal",
       "cancelExchangeDeal",

package/gen/user.ts

@@ -430,6 +430,26 @@ export interface BatchGetUserIdsBySearchResponse {
   totalMatches: number;
 }
 
+export interface SearchUserRequest {
+  search: string;
+  /** По умолчанию 50, максимум 50. */
+  limit: number;
+}
+
+export interface SearchUserItem {
+  id: number;
+  uid: number;
+  firstName?: string | undefined;
+  lastName?: string | undefined;
+  email?: string | undefined;
+  phone?: string | undefined;
+  telegramUsername?: string | undefined;
+}
+
+export interface SearchUserResponse {
+  items: SearchUserItem[];
+}
+
 export interface BatchGetUsersByIdsRequest {
   userIds: number[];
 }
@@ -587,6 +607,10 @@ export interface UserServiceClient {
 
   batchGetUserIdsBySearch(request: BatchGetUserIdsBySearchRequest): Observable<BatchGetUserIdsBySearchResponse>;
 
+  /** Поиск пользователей по строке: возвращает до 50 совпадений с полями, по которым ведется поиск. */
+
+  searchUser(request: SearchUserRequest): Observable<SearchUserResponse>;
+
   /** Батч-получение публичных данных пользователей по списку id (для enrichment в других сервисах). */
 
   batchGetUsersByIds(request: BatchGetUsersByIdsRequest): Observable<BatchGetUsersByIdsResponse>;
@@ -800,6 +824,12 @@ export interface UserServiceController {
     | Observable<BatchGetUserIdsBySearchResponse>
     | BatchGetUserIdsBySearchResponse;
 
+  /** Поиск пользователей по строке: возвращает до 50 совпадений с полями, по которым ведется поиск. */
+
+  searchUser(
+    request: SearchUserRequest,
+  ): Promise<SearchUserResponse> | Observable<SearchUserResponse> | SearchUserResponse;
+
   /** Батч-получение публичных данных пользователей по списку id (для enrichment в других сервисах). */
 
   batchGetUsersByIds(
@@ -842,6 +872,7 @@ export function UserServiceControllerMethods() {
       "requestChangePhoneCode",
       "verifyChangePhoneCode",
       "batchGetUserIdsBySearch",
+      "searchUser",
       "batchGetUsersByIds",
     ];
     for (const method of grpcMethods) {

package/package.json

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

package/proto/exchange_core.proto

@@ -11,6 +11,7 @@ option java_package = "com.arbiwallet.exchange.core";
 service ExchangeCoreService {
   rpc CreateExchangeDeal(CreateExchangeDealRequest) returns (CreateExchangeDealResponse);
   rpc GetExchangeDeals(GetExchangeDealsRequest) returns (GetExchangeDealsResponse);
+  rpc GetExchangeDealDetails(GetExchangeDealDetailsRequest) returns (GetExchangeDealDetailsResponse);
   rpc UpdateExchangeDeal(UpdateExchangeDealRequest) returns (UpdateExchangeDealResponse);
   rpc CompleteExchangeDeal(CompleteExchangeDealRequest) returns (CompleteExchangeDealResponse);
   rpc CancelExchangeDeal(CancelExchangeDealRequest) returns (CancelExchangeDealResponse);
@@ -126,6 +127,75 @@ message GetExchangeDealsResponse {
   repeated GetExchangeDealsItem results = 4;
 }
 
+message GetExchangeDealDetailsRequest {
+  AuthManagerContext auth_manager_context = 1;
+  string id = 2;
+}
+
+message GetExchangeDealDetailsResult {
+  string id = 1;
+  string user_id = 2;
+
+  string customer_id = 3;
+  string customer_full_name = 4;
+  optional string customer_chat_link = 5;
+  optional string customer_url = 6;
+
+  optional string referrer_id = 7;
+  optional string referrer_full_name = 8;
+  optional string referrer_url = 9;
+  optional double referrer_percent = 10;
+
+  string created_at = 11;
+
+  double input_amount = 12;
+  string input_currency_id = 13;
+  optional string input_currency_short_name = 14;
+  string input_wallet_id = 15;
+  optional string input_wallet_name = 16;
+  string method_id = 17;
+  optional string method_name = 18;
+
+  double output_amount = 19;
+  string output_currency_id = 20;
+  optional string output_currency_short_name = 21;
+  string output_wallet_id = 22;
+  optional string output_wallet_name = 23;
+
+  bool one_currency_exchange = 24;
+  bool received_from_dealer = 25;
+  optional string received_from_dealer_wallet_id = 26;
+  optional string received_from_dealer_wallet_name = 27;
+
+  optional string exchange_status_id = 28;
+  optional string exchange_status_name = 29;
+  bool payed = 30;
+
+  optional double buy_price = 31;
+  optional double sell_price = 32;
+  optional double profit_percent = 33;
+  optional double profit = 34;
+
+  optional string profit_currency_id = 35;
+  optional string profit_currency_short_name = 36;
+  optional double usdt_rate = 37;
+  optional double usdt_profit = 38;
+  bool profit_accounting = 39;
+  optional string profit_date = 40;
+
+  optional string expenses_currency_id = 41;
+  optional string expenses_currency_short_name = 42;
+  optional double expenses_for_courier = 43;
+  optional double expenses_for_referrer = 44;
+}
+
+message GetExchangeDealDetailsResponse {
+  bool ok = 1;
+  optional GetExchangeDealDetailsResult result = 2;
+  optional string error = 3;
+  optional google.protobuf.Struct validationErrors = 4;
+}
+
 message UpdateExchangeDealRequest {
   AuthManagerContext auth_manager_context = 1;
   string id = 2;

package/proto/user.proto

@@ -55,6 +55,8 @@ service UserService {
   rpc VerifyChangePhoneCode (VerifyChangePhoneCodeRequest) returns (UserResponse);
   // Батч-поиск пользователей по строке: возвращает только id (с защитой от слишком широкого поиска).
   rpc BatchGetUserIdsBySearch (BatchGetUserIdsBySearchRequest) returns (BatchGetUserIdsBySearchResponse);
+  // Поиск пользователей по строке: возвращает до 50 совпадений с полями, по которым ведется поиск.
+  rpc SearchUser (SearchUserRequest) returns (SearchUserResponse);
   // Батч-получение публичных данных пользователей по списку id (для enrichment в других сервисах).
   rpc BatchGetUsersByIds (BatchGetUsersByIdsRequest) returns (BatchGetUsersByIdsResponse);
 }
@@ -472,6 +474,26 @@ message BatchGetUserIdsBySearchResponse {
   int32 total_matches = 3;
 }
 
+message SearchUserRequest {
+  string search = 1;
+  // По умолчанию 50, максимум 50.
+  int32 limit = 2;
+}
+
+message SearchUserItem {
+  int32 id = 1;
+  int32 uid = 2;
+  optional string first_name = 3;
+  optional string last_name = 4;
+  optional string email = 5;
+  optional string phone = 6;
+  optional string telegram_username = 7;
+}
+
+message SearchUserResponse {
+  repeated SearchUserItem items = 1;
+}
+
 message BatchGetUsersByIdsRequest {
   repeated int32 user_ids = 1;
 }