@devline-smart-taxi/common 2.3.83 → 2.3.85

package/dist/proto/branch.proto

@@ -19,7 +19,6 @@ service BranchService {
   rpc UpdateBranch (UpdateBranchRequest) returns (common.SuccessResponseResult);
   rpc GetAllBranches (GetAllBranchesRequest) returns (BranchPaginationResponse);
   rpc GetBranchById (common.IdRequest) returns (BranchResponse);
-  rpc GetMyBranches (common.NoParams) returns (MyBranchResponse);
   rpc DeleteBranch (common.IdRequest) returns (common.SuccessResponseResult);
   rpc DeactivateBranch (common.IdRequest) returns (common.SuccessResponseResult);
   rpc GetGlobalCommission (common.NoParams) returns (CommissionResponse);
@@ -91,12 +90,6 @@ message BranchData {
   optional double driverCommissionRate = 9;
 }
 
-message MyBranchResponse {
-  int32 statusCode = 1;
-  string message = 2;
-  repeated BranchData data = 3;
-}
-
 message CommissionData {
   double driverCommissionRate = 1;
 }

package/dist/proto/driver.proto

@@ -32,6 +32,9 @@ service DriverService {
   // ID bo'yicha haydovchi ma'lumotlarini olish
   rpc GetDriverById (common.IdRequest) returns (DriverResponse);
 
+  // Ichki servislar uchun: branch bo'yicha haydovchilar ro'yxati
+  rpc GetDriversByBranch (GetDriversByBranchRequest) returns (DriversByBranchResponse);
+
   // Haydovchi profileni ko'rishi
   rpc GetDriverProfile (common.IdRequest) returns (DriverResponse);
 
@@ -144,6 +147,10 @@ message GetAllDriversRequest {
   optional string search = 3; // Qidiruv so'zi (phoneNumber bo'yicha)
 }
 
+message GetDriversByBranchRequest {
+  string branchId = 1;
+}
+
 message SaveDriverLicenseRequest {
   string phoneNumber = 1; // Haydovchi telefon raqami
   string licenseNumber = 2; // Haydovchilik guvohnomasi raqami
@@ -337,6 +344,12 @@ message DriverResponse {
   DriverData data = 3;
 }
 
+message DriversByBranchResponse {
+  int32 statusCode = 1;
+  string message = 2;
+  repeated DriverBranchData data = 3;
+}
+
 message PasswordResponse {
   string message = 1;
   int32 statusCode = 2;
@@ -444,6 +457,15 @@ message DriverCarData {
   optional string remark = 14;
 }
 
+message DriverBranchData {
+  string id = 1;
+  string firstName = 2;
+  string lastName = 3;
+  string phoneNumber = 4;
+  bool isActive = 5;
+  string status = 6;
+}
+
 // Rasm (UsersImage) ma'lumotlari (short format)
 message UsersImageData {
   string id = 1;

package/dist/proto/wallet.proto

@@ -28,6 +28,7 @@ service WalletService {
   rpc GetAllDriverBalances (GetAllDriverBalancesRequest) returns (AllDriverBalancesResponse);
   rpc GetSettlementOverview (GetSettlementOverviewRequest) returns (SettlementOverviewResponse);
   rpc GetAdminDriverSettlement (GetAdminDriverSettlementRequest) returns (AdminDriverSettlementResponse);
+  rpc GetBranchDashboard (GetBranchDashboardRequest) returns (BranchDashboardResponse);
 }
 
 // ==========================================
@@ -120,6 +121,66 @@ message AdminDriverSettlementData {
   DriverSettlementLedgerData ledger = 2;
 }
 
+message DashboardComparisonMetricData {
+  float current = 1;
+  float previous = 2;
+  float delta = 3;
+  float deltaPct = 4;
+  string trend = 5;
+}
+
+message BranchDashboardOverviewData {
+  float grossEarnings = 1;
+  float netAfterSettlement = 2;
+  float platformCommission = 3;
+  int32 totalTrips = 4;
+  int32 activeDrivers = 5;
+  float totalAvailableToWithdraw = 6;
+  float totalOutstandingDebt = 7;
+}
+
+message DashboardTimeSeriesPointData {
+  string label = 1;
+  float value = 2;
+}
+
+message TopDriverDashboardData {
+  string driverId = 1;
+  string fullName = 2;
+  int32 trips = 3;
+  float grossEarnings = 4;
+  float netAfterSettlement = 5;
+  float platformCommission = 6;
+  float outstandingDebt = 7;
+  float availableToWithdraw = 8;
+}
+
+message TopDebtorDashboardData {
+  string driverId = 1;
+  string fullName = 2;
+  float outstandingDebt = 3;
+  int32 cashTrips = 4;
+  float grossEarnings = 5;
+  float platformCommission = 6;
+}
+
+message BranchDashboardData {
+  string branchId = 1;
+  string period = 2;
+  string fromDate = 3;
+  string toDate = 4;
+  BranchDashboardOverviewData overview = 5;
+  DashboardComparisonMetricData grossEarningsComparison = 6;
+  DashboardComparisonMetricData netAfterSettlementComparison = 7;
+  DashboardComparisonMetricData platformCommissionComparison = 8;
+  DashboardComparisonMetricData totalTripsComparison = 9;
+  repeated DashboardTimeSeriesPointData grossEarningsSeries = 10;
+  repeated DashboardTimeSeriesPointData netAfterSettlementSeries = 11;
+  repeated DashboardTimeSeriesPointData platformCommissionSeries = 12;
+  repeated TopDriverDashboardData topDrivers = 13;
+  repeated TopDebtorDashboardData topDebtors = 14;
+}
+
 // ==========================================
 // 3. REQUESTS
 // ==========================================
@@ -209,6 +270,13 @@ message GetAdminDriverSettlementRequest {
   optional string toDate = 6;
 }
 
+message GetBranchDashboardRequest {
+  string branchId = 1;
+  string period = 2;
+  optional string referenceDate = 3;
+  optional int32 topLimit = 4;
+}
+
 // ==========================================
 // 4. RESPONSES
 // ==========================================
@@ -338,3 +406,9 @@ message AdminDriverSettlementResponse {
   string message = 2;
   AdminDriverSettlementData data = 3;
 }
+
+message BranchDashboardResponse {
+  int32 statusCode = 1;
+  string message = 2;
+  BranchDashboardData data = 3;
+}

package/package.json

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