@devline-smart-taxi/common 2.3.80 → 2.3.82

package/dist/proto/branch.proto

@@ -22,6 +22,12 @@ service BranchService {
   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);
+  rpc UpdateGlobalCommission (UpdateGlobalCommissionRequest) returns (common.SuccessResponseResult);
+  rpc GetBranchCommission (common.IdRequest) returns (BranchCommissionResponse);
+  rpc UpdateBranchCommission (UpdateBranchCommissionRequest) returns (common.SuccessResponseResult);
+  rpc ClearBranchCommission (common.IdRequest) returns (common.SuccessResponseResult);
+  rpc GetDriverEffectiveCommission (GetDriverEffectiveCommissionRequest) returns (DriverEffectiveCommissionResponse);
 }
 
 // ==========================================
@@ -36,6 +42,7 @@ message UpdateBranchRequest {
   string id = 1;
   optional string name = 2;
   optional string region = 3;
+  optional double driverCommissionRate = 4;
 }
 
 message GetAllBranchesRequest {
@@ -44,6 +51,19 @@ message GetAllBranchesRequest {
   optional string search = 3;
 }
 
+message UpdateGlobalCommissionRequest {
+  double driverCommissionRate = 1;
+}
+
+message UpdateBranchCommissionRequest {
+  string id = 1;
+  double driverCommissionRate = 2;
+}
+
+message GetDriverEffectiveCommissionRequest {
+  string driverId = 1;
+}
+
 // ==========================================
 // 3. RESPONSE MESSAGES
 // ==========================================
@@ -75,6 +95,7 @@ message BranchData {
   string createdAt = 6;
   optional string updatedAt = 7;
   repeated string manager_ids = 8;
+  optional double driverCommissionRate = 9;
 }
 
 message MyBranchResponse {
@@ -82,3 +103,40 @@ message MyBranchResponse {
   string message = 2;
   repeated BranchData data = 3;
 }
+
+message CommissionData {
+  double driverCommissionRate = 1;
+}
+
+message CommissionResponse {
+  int32 statusCode = 1;
+  string message = 2;
+  CommissionData data = 3;
+}
+
+message BranchCommissionData {
+  string branchId = 1;
+  optional double branchCommissionRate = 2;
+  double globalCommissionRate = 3;
+  double effectiveCommissionRate = 4;
+}
+
+message BranchCommissionResponse {
+  int32 statusCode = 1;
+  string message = 2;
+  BranchCommissionData data = 3;
+}
+
+message DriverEffectiveCommissionData {
+  string driverId = 1;
+  optional string branchId = 2;
+  optional double branchCommissionRate = 3;
+  double globalCommissionRate = 4;
+  double effectiveCommissionRate = 5;
+}
+
+message DriverEffectiveCommissionResponse {
+  int32 statusCode = 1;
+  string message = 2;
+  DriverEffectiveCommissionData data = 3;
+}

package/dist/proto/driver.proto

@@ -65,6 +65,15 @@ service DriverService {
   // Mashina ma'lumotlarini yangilash
   rpc UpdateCarInfo (UpdateDriverCarInfoRequest) returns (common.SuccessResponseResult);
 
+  // Auth orqali qo'shimcha mashina qo'shish
+  rpc AddCar (CreateDriverCarRequest) returns (common.SuccessResponseResult);
+
+  // Qo'shimcha mashinani tasdiqlash
+  rpc ApproveCar (ApproveDriverCarRequest) returns (common.SuccessResponseResult);
+
+  // Qo'shimcha mashinani rad etish
+  rpc RejectCar (RejectDriverCarRequest) returns (common.SuccessResponseResult);
+
   // Haydovchilik guvohnomasini yangilash
   rpc UpdateDriverLicense (UpdateDriverLicenseRequest) returns (common.SuccessResponseResult);
 
@@ -239,6 +248,29 @@ message UpdateDriverCarInfoRequest {
   optional string carClassId = 9;
 }
 
+message CreateDriverCarRequest {
+  string id = 1;
+  string carBrand = 2;
+  string carModel = 3;
+  string carNumber = 4;
+  string carColor = 5;
+  bool isOwner = 6;
+  string documentFrontId = 7;
+  string documentBackId = 8;
+}
+
+message ApproveDriverCarRequest {
+  string driverId = 1;
+  string carId = 2;
+  string carClassId = 3;
+}
+
+message RejectDriverCarRequest {
+  string driverId = 1;
+  string carId = 2;
+  string reason = 3;
+}
+
 message UpdateDriverLicenseRequest {
   string id = 1;
   optional string licenseNumber = 2;
@@ -408,6 +440,8 @@ message DriverCarData {
   optional string carClassId = 10;
   optional string carClassName = 11;
   bool isActive = 12;
+  optional string approvalStatus = 13;
+  optional string remark = 14;
 }
 
 // Rasm (UsersImage) ma'lumotlari (short format)

package/package.json

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