@devline-smart-taxi/common 2.3.52 → 2.3.53

package/dist/enums/payment.enum.d.ts

@@ -8,3 +8,20 @@ export declare enum PaymentStatus {
     FAILED = "failed",// to`lov amalga oshirilmagan yoki muvaffaqiyatsiz holat
     CANCELLED = "cancelled"
 }
+export declare enum WalletOwnerType {
+    CLIENT = "CLIENT",
+    DRIVER = "DRIVER"
+}
+export declare enum WalletTransactionType {
+    PROMO_CODE = "PROMO_CODE",
+    REFERRAL_BONUS = "REFERRAL_BONUS",
+    TRIP_PAYMENT = "TRIP_PAYMENT",
+    TRIP_COUNT_BONUS = "TRIP_COUNT_BONUS",
+    TRIP_EARNING = "TRIP_EARNING",
+    WITHDRAWAL = "WITHDRAWAL"
+}
+export declare enum WithdrawalStatus {
+    PENDING = "PENDING",
+    APPROVED = "APPROVED",
+    REJECTED = "REJECTED"
+}

package/dist/enums/payment.enum.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PaymentStatus = exports.PaymentMethod = void 0;
+exports.WithdrawalStatus = exports.WalletTransactionType = exports.WalletOwnerType = exports.PaymentStatus = exports.PaymentMethod = void 0;
 var PaymentMethod;
 (function (PaymentMethod) {
     PaymentMethod["CASH"] = "cash";
@@ -13,3 +13,23 @@ var PaymentStatus;
     PaymentStatus["FAILED"] = "failed";
     PaymentStatus["CANCELLED"] = "cancelled";
 })(PaymentStatus || (exports.PaymentStatus = PaymentStatus = {}));
+var WalletOwnerType;
+(function (WalletOwnerType) {
+    WalletOwnerType["CLIENT"] = "CLIENT";
+    WalletOwnerType["DRIVER"] = "DRIVER";
+})(WalletOwnerType || (exports.WalletOwnerType = WalletOwnerType = {}));
+var WalletTransactionType;
+(function (WalletTransactionType) {
+    WalletTransactionType["PROMO_CODE"] = "PROMO_CODE";
+    WalletTransactionType["REFERRAL_BONUS"] = "REFERRAL_BONUS";
+    WalletTransactionType["TRIP_PAYMENT"] = "TRIP_PAYMENT";
+    WalletTransactionType["TRIP_COUNT_BONUS"] = "TRIP_COUNT_BONUS";
+    WalletTransactionType["TRIP_EARNING"] = "TRIP_EARNING";
+    WalletTransactionType["WITHDRAWAL"] = "WITHDRAWAL";
+})(WalletTransactionType || (exports.WalletTransactionType = WalletTransactionType = {}));
+var WithdrawalStatus;
+(function (WithdrawalStatus) {
+    WithdrawalStatus["PENDING"] = "PENDING";
+    WithdrawalStatus["APPROVED"] = "APPROVED";
+    WithdrawalStatus["REJECTED"] = "REJECTED";
+})(WithdrawalStatus || (exports.WithdrawalStatus = WithdrawalStatus = {}));

package/dist/index.d.ts

@@ -25,11 +25,6 @@ export * from './dto/create-trip.dto';
 export * from './dto/update-trip.dto';
 export * from './dto/trip-action.dto';
 export * from './dto/trip-response.dto';
-export * from './dto/create-transaction.dto';
-export * from './dto/add-earning.dto';
-export * from './dto/withdraw-balance.dto';
-export * from './dto/get-transactions.dto';
-export * from './proto/balance-proto-path';
 export * from './proto/rating-proto-path';
 export * from './proto/car-class-proto-path';
 export * from './proto/car-manufacturer-proto-path';

package/dist/index.js

@@ -42,11 +42,6 @@ __exportStar(require("./dto/create-trip.dto"), exports);
 __exportStar(require("./dto/update-trip.dto"), exports);
 __exportStar(require("./dto/trip-action.dto"), exports);
 __exportStar(require("./dto/trip-response.dto"), exports);
-__exportStar(require("./dto/create-transaction.dto"), exports);
-__exportStar(require("./dto/add-earning.dto"), exports);
-__exportStar(require("./dto/withdraw-balance.dto"), exports);
-__exportStar(require("./dto/get-transactions.dto"), exports);
-__exportStar(require("./proto/balance-proto-path"), exports);
 __exportStar(require("./proto/rating-proto-path"), exports);
 __exportStar(require("./proto/car-class-proto-path"), exports);
 __exportStar(require("./proto/car-manufacturer-proto-path"), exports);

package/dist/proto/wallet.proto

@@ -5,21 +5,34 @@ package wallet;
 import "common.proto";
 
 // ==========================================
-// 1. SERVICES
+// 1. SERVICE
 // ==========================================
 
 service WalletService {
+  // Client
   rpc GetMyWallet (GetMyWalletRequest) returns (WalletResponse);
+  rpc ApplyPromoCode (ApplyPromoCodeRequest) returns (WalletResponse);
+
+  // Driver
+  rpc GetDriverBalance (GetDriverBalanceRequest) returns (DriverBalanceResponse);
+  rpc AddDriverEarning (AddDriverEarningRequest) returns (AddDriverEarningResponse);
+  rpc GetDriverTransactions (GetDriverTransactionsRequest) returns (DriverTransactionListResponse);
+  rpc RequestWithdrawal (RequestWithdrawalRequest) returns (WithdrawalResponse);
+
+  // Admin
+  rpc ProcessWithdrawal (ProcessWithdrawalRequest) returns (ProcessWithdrawalResponse);
+  rpc GetPendingWithdrawals (GetPendingWithdrawalsRequest) returns (PendingWithdrawalsResponse);
+  rpc GetAllDriverBalances (GetAllDriverBalancesRequest) returns (AllDriverBalancesResponse);
 }
 
 // ==========================================
-// 2. COMMON MESSAGES
+// 2. COMMON DATA MESSAGES
 // ==========================================
 
 message WalletTransactionData {
   string id = 1;
   float amount = 2;
-  string type = 3; // e.g. REFERRAL_BONUS, TRIP_PAYMENT, 5_TRIPS_BONUS
+  string type = 3;
   string description = 4;
   string createdAt = 5;
 }
@@ -29,20 +42,187 @@ message WalletData {
   repeated WalletTransactionData transactions = 2;
 }
 
+message DriverTransactionData {
+  string id = 1;
+  float amount = 2;
+  string type = 3;
+  string description = 4;
+  optional string paymentMethod = 5;
+  optional string status = 6;
+  optional string tripId = 7;
+  optional string clientId = 8;
+  string createdAt = 9;
+}
+
+message WithdrawalData {
+  string id = 1;
+  string driverId = 2;
+  float amount = 3;
+  string cardNumber = 4;
+  string cardHolderName = 5;
+  string status = 6;
+  string createdAt = 7;
+}
+
+message DriverBalanceData {
+  string driverId = 1;
+  float balance = 2;
+}
+
 // ==========================================
 // 3. REQUESTS
 // ==========================================
 
+// Client
 message GetMyWalletRequest {
   string clientId = 1;
 }
 
+message ApplyPromoCodeRequest {
+  string clientId = 1;
+  string promoCode = 2;
+}
+
+// Driver
+message GetDriverBalanceRequest {
+  string driverId = 1;
+}
+
+message AddDriverEarningRequest {
+  string driverId = 1;
+  string clientId = 2;
+  string tripId = 3;
+  float amount = 4;
+  string type = 5;
+}
+
+message GetDriverTransactionsRequest {
+  string driverId = 1;
+  int32 page = 2;
+  int32 pageSize = 3;
+}
+
+message RequestWithdrawalRequest {
+  string driverId = 1;
+  float amount = 2;
+  string cardNumber = 3;
+  string cardHolderName = 4;
+}
+
+// Admin
+message ProcessWithdrawalRequest {
+  string withdrawalId = 1;
+  string action = 2;
+  string processedBy = 3;
+  optional string rejectionReason = 4;
+}
+
+message GetPendingWithdrawalsRequest {
+  int32 page = 1;
+  int32 pageSize = 2;
+}
+
+message GetAllDriverBalancesRequest {
+  int32 page = 1;
+  int32 pageSize = 2;
+}
+
 // ==========================================
 // 4. RESPONSES
 // ==========================================
 
+// Client
 message WalletResponse {
   int32 statusCode = 1;
   string message = 2;
   WalletData data = 3;
 }
+
+// Driver balance
+message DriverBalanceResponse {
+  int32 statusCode = 1;
+  string message = 2;
+  DriverBalanceData data = 3;
+}
+
+// Driver earning added
+message AddDriverEarningData {
+  string transactionId = 1;
+  float balance = 2;
+}
+
+message AddDriverEarningResponse {
+  int32 statusCode = 1;
+  string message = 2;
+  AddDriverEarningData data = 3;
+}
+
+// Driver transactions
+message DriverTransactionListData {
+  repeated DriverTransactionData transactions = 1;
+  int32 total = 2;
+  int32 page = 3;
+  int32 pageSize = 4;
+}
+
+message DriverTransactionListResponse {
+  int32 statusCode = 1;
+  string message = 2;
+  DriverTransactionListData data = 3;
+}
+
+// Withdrawal request created
+message WithdrawalResponseData {
+  string id = 1;
+  float amount = 2;
+  string cardNumber = 3;
+  string status = 4;
+  string createdAt = 5;
+}
+
+message WithdrawalResponse {
+  int32 statusCode = 1;
+  string message = 2;
+  WithdrawalResponseData data = 3;
+}
+
+// Withdrawal processed
+message ProcessWithdrawalData {
+  string id = 1;
+  string status = 2;
+  optional string processedAt = 3;
+}
+
+message ProcessWithdrawalResponse {
+  int32 statusCode = 1;
+  string message = 2;
+  ProcessWithdrawalData data = 3;
+}
+
+// Pending withdrawals list
+message PendingWithdrawalsData {
+  repeated WithdrawalData withdrawals = 1;
+  int32 total = 2;
+  int32 page = 3;
+  int32 pageSize = 4;
+}
+
+message PendingWithdrawalsResponse {
+  int32 statusCode = 1;
+  string message = 2;
+  PendingWithdrawalsData data = 3;
+}
+
+// All driver balances
+message AllDriverBalancesData {
+  repeated DriverBalanceData wallets = 1;
+  int32 total = 2;
+  int32 page = 3;
+  int32 pageSize = 4;
+}
+
+message AllDriverBalancesResponse {
+  int32 statusCode = 1;
+  string message = 2;
+  AllDriverBalancesData data = 3;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devline-smart-taxi/common",
-  "version": "2.3.52",
+  "version": "2.3.53",
   "description": "Reusable NestJS common library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/dto/add-earning.dto.d.ts

@@ -1,8 +0,0 @@
-import { PaymentMethod } from '../enums/payment.enum';
-export declare class AddEarningDto {
-    driverId: string;
-    clientId: string;
-    tripId: string;
-    amount: number;
-    type: PaymentMethod;
-}

package/dist/dto/add-earning.dto.js

@@ -1,41 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AddEarningDto = void 0;
-const class_validator_1 = require("class-validator");
-const payment_enum_1 = require("../enums/payment.enum");
-class AddEarningDto {
-}
-exports.AddEarningDto = AddEarningDto;
-__decorate([
-    (0, class_validator_1.IsUUID)('4', { message: "INVALID_ID" }),
-    (0, class_validator_1.IsNotEmpty)({ message: "EMPTY_ID" }),
-    __metadata("design:type", String)
-], AddEarningDto.prototype, "driverId", void 0);
-__decorate([
-    (0, class_validator_1.IsUUID)('4', { message: "INVALID_ID" }),
-    (0, class_validator_1.IsNotEmpty)({ message: "EMPTY_ID" }),
-    __metadata("design:type", String)
-], AddEarningDto.prototype, "clientId", void 0);
-__decorate([
-    (0, class_validator_1.IsUUID)('4', { message: "INVALID_ID" }),
-    (0, class_validator_1.IsNotEmpty)({ message: "EMPTY_ID" }),
-    __metadata("design:type", String)
-], AddEarningDto.prototype, "tripId", void 0);
-__decorate([
-    (0, class_validator_1.IsNumber)({}, { message: "INVALID_AMOUNT" }),
-    (0, class_validator_1.Min)(0, { message: "INVALID_AMOUNT" }),
-    __metadata("design:type", Number)
-], AddEarningDto.prototype, "amount", void 0);
-__decorate([
-    (0, class_validator_1.IsEnum)(payment_enum_1.PaymentMethod, { message: "INVALID_PAYMENT_TYPE" }),
-    __metadata("design:type", String)
-], AddEarningDto.prototype, "type", void 0);

package/dist/dto/create-transaction.dto.d.ts

@@ -1,8 +0,0 @@
-import { PaymentMethod } from '../enums/payment.enum';
-export declare class CreateTransactionDto {
-    driverId: string;
-    clientId: string;
-    tripId: string;
-    amount: number;
-    type: PaymentMethod;
-}

package/dist/dto/create-transaction.dto.js

@@ -1,41 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CreateTransactionDto = void 0;
-const class_validator_1 = require("class-validator");
-const payment_enum_1 = require("../enums/payment.enum");
-class CreateTransactionDto {
-}
-exports.CreateTransactionDto = CreateTransactionDto;
-__decorate([
-    (0, class_validator_1.IsUUID)('4', { message: "INVALID_ID" }),
-    (0, class_validator_1.IsNotEmpty)({ message: "EMPTY_ID" }),
-    __metadata("design:type", String)
-], CreateTransactionDto.prototype, "driverId", void 0);
-__decorate([
-    (0, class_validator_1.IsUUID)('4', { message: "INVALID_ID" }),
-    (0, class_validator_1.IsNotEmpty)({ message: "EMPTY_ID" }),
-    __metadata("design:type", String)
-], CreateTransactionDto.prototype, "clientId", void 0);
-__decorate([
-    (0, class_validator_1.IsUUID)('4', { message: "INVALID_ID" }),
-    (0, class_validator_1.IsNotEmpty)({ message: "EMPTY_ID" }),
-    __metadata("design:type", String)
-], CreateTransactionDto.prototype, "tripId", void 0);
-__decorate([
-    (0, class_validator_1.IsNumber)({}, { message: "INVALID_AMOUNT" }),
-    (0, class_validator_1.Min)(0, { message: "INVALID_AMOUNT" }),
-    __metadata("design:type", Number)
-], CreateTransactionDto.prototype, "amount", void 0);
-__decorate([
-    (0, class_validator_1.IsEnum)(payment_enum_1.PaymentMethod, { message: "INVALID_PAYMENT_TYPE" }),
-    __metadata("design:type", String)
-], CreateTransactionDto.prototype, "type", void 0);

package/dist/dto/get-transactions.dto.d.ts

@@ -1,4 +0,0 @@
-import { FilterDto } from './filter.dto';
-export declare class GetTransactionsDto extends FilterDto {
-    driverId: string;
-}

package/dist/dto/get-transactions.dto.js

@@ -1,22 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetTransactionsDto = void 0;
-const class_validator_1 = require("class-validator");
-const filter_dto_1 = require("./filter.dto");
-class GetTransactionsDto extends filter_dto_1.FilterDto {
-}
-exports.GetTransactionsDto = GetTransactionsDto;
-__decorate([
-    (0, class_validator_1.IsUUID)('4', { message: "INVALID_ID" }),
-    (0, class_validator_1.IsNotEmpty)({ message: "EMPTY_ID" }),
-    __metadata("design:type", String)
-], GetTransactionsDto.prototype, "driverId", void 0);

package/dist/dto/withdraw-balance.dto.d.ts

@@ -1,4 +0,0 @@
-export declare class WithdrawBalanceDto {
-    driverId: string;
-    amount: number;
-}

package/dist/dto/withdraw-balance.dto.js

@@ -1,26 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WithdrawBalanceDto = void 0;
-const class_validator_1 = require("class-validator");
-class WithdrawBalanceDto {
-}
-exports.WithdrawBalanceDto = WithdrawBalanceDto;
-__decorate([
-    (0, class_validator_1.IsUUID)('4', { message: "INVALID_ID" }),
-    (0, class_validator_1.IsNotEmpty)({ message: "EMPTY_ID" }),
-    __metadata("design:type", String)
-], WithdrawBalanceDto.prototype, "driverId", void 0);
-__decorate([
-    (0, class_validator_1.IsNumber)({}, { message: "INVALID_AMOUNT" }),
-    (0, class_validator_1.Min)(1, { message: "INVALID_AMOUNT" }),
-    __metadata("design:type", Number)
-], WithdrawBalanceDto.prototype, "amount", void 0);

package/dist/proto/balance-proto-path.d.ts

@@ -1 +0,0 @@
-export declare const balanceProtoPath: string;

package/dist/proto/balance-proto-path.js

@@ -1,4 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.balanceProtoPath = void 0;
-exports.balanceProtoPath = `${__dirname}/balance.proto`;

package/dist/proto/balance-proto-path.ts

@@ -1,2 +0,0 @@
-declare const __dirname: string;
-export const balanceProtoPath = `${__dirname}/balance.proto`;

package/dist/proto/balance.proto

@@ -1,114 +0,0 @@
-syntax = "proto3";
-
-package balance;
-
-import "common.proto";
-
-// ==========================================
-// 1. SERVICE
-// ==========================================
-service BalanceService {
-  // Driver balansini olish
-  rpc GetBalance (common.IdRequest) returns (BalanceResponse);
-
-  // Trip daromadini qo'shish (core-service chaqiradi)
-  rpc AddEarning (AddEarningRequest) returns (AddEarningResponse);
-
-  // Pul yechish (admin tasdiqlaydi)
-  rpc WithdrawBalance (WithdrawBalanceRequest) returns (BalanceResponse);
-
-  // Transaction yaratish (trip tugaganda)
-  rpc CreateTransaction (CreateTransactionRequest) returns (TransactionResponse);
-
-  // Driver transaction tarixini olish
-  rpc GetDriverTransactions (GetDriverTransactionsRequest) returns (TransactionListResponse);
-
-  // Trip bo'yicha transactionlarni olish
-  rpc GetTransactionsByTrip (common.IdRequest) returns (TransactionListResponse);
-}
-
-// ==========================================
-// 2. REQUEST MESSAGES
-// ==========================================
-message AddEarningRequest {
-  string driverId = 1;
-  float amount = 2;
-  string tripId = 3;
-  string clientId = 4;
-  string type = 5; // 'cash' | 'card'
-}
-
-message WithdrawBalanceRequest {
-  string driverId = 1;
-  float amount = 2;
-}
-
-message CreateTransactionRequest {
-  string driverId = 1;
-  string clientId = 2;
-  string tripId = 3;
-  float amount = 4;
-  string type = 5; // 'cash' | 'card'
-}
-
-message GetDriverTransactionsRequest {
-  string driverId = 1;
-  optional int32 page = 2;
-  optional int32 pageSize = 3;
-}
-
-// ==========================================
-// 3. RESPONSE MESSAGES
-// ==========================================
-message BalanceResponse {
-  int32 statusCode = 1;
-  string message = 2;
-  optional BalanceData data = 3;
-}
-
-message BalanceData {
-  string driverId = 1;
-  float balance = 2;
-}
-
-message AddEarningResponse {
-  int32 statusCode = 1;
-  string message = 2;
-  optional AddEarningData data = 3;
-}
-
-message AddEarningData {
-  string transactionId = 1;
-  float balance = 2;
-}
-
-message TransactionResponse {
-  int32 statusCode = 1;
-  string message = 2;
-  optional TransactionData data = 3;
-}
-
-message TransactionData {
-  string id = 1;
-  string driverId = 2;
-  string clientId = 3;
-  string tripId = 4;
-  float amount = 5;
-  string type = 6;
-  string status = 7;
-  optional string paymeTransactionId = 8;
-  string createdAt = 9;
-}
-
-message TransactionListResponse {
-  int32 statusCode = 1;
-  string message = 2;
-  optional TransactionListData data = 3;
-}
-
-message TransactionListData {
-  repeated TransactionData transactions = 1;
-  int32 total = 2;
-  int32 page = 3;
-  int32 pageSize = 4;
-}