@devline-smart-taxi/common 2.3.26 → 2.3.28

package/README.md

@@ -1,18 +1,67 @@
-## Common Package
+# @devline-smart-taxi/common
 
-### Ma\'lumot
-Bu `package` ga bir martadan ortiq service da qo\'llaniladigan class/interface/enum kabi code bloklari joylanadi.
+## Ma'lumot
 
-Yangi qo\'shimchalar kiritilgach quyidagicha `package` yangi versiyasi e\'lon qilinadi:
+Bu `package` ga bir martadan ortiq service da qo'llaniladigan class/interface/enum kabi code bloklari joylanadi.
 
-`npm version patch`
+## O'rnatish
 
-`npm publish`
+```bash
+npm install @devline-smart-taxi/common
+```
 
-Shunaqa ko'rinishda yangilanganligini bilishimiz mumkin bo`ladi:
+Hech qanday token yoki `.npmrc` konfiguratsiya talab qilinmaydi — package npm registryda **public** holatda mavjud.
 
-```+ @devline-smart-taxi/common@1.0.1```
+## Publishing (CI/CD)
 
+Package **npm** va **GitHub Packages** registrylariga GitHub Actions orqali avtomatik publish qilinadi.
 
-### O\'rnatish
-```npm install @devline-smart-taxi/common```
+### Avtomatik publishing
+
+Publishing faqat **Pull Request `dev` branchga merge bo'lganda** ishga tushadi. Workflow quyidagilarni bajaradi:
+
+1. Patch versionni avtomatik bump qiladi
+2. npm registryga publish qiladi
+3. GitHub Packages ga publish qiladi
+
+> **Eslatma:** `dev` branchga to'g'ridan-to'g'ri push qilish publishing ni **ishga tushirmaydi**. Faqat PR merge va manual trigger ishlaydi.
+
+### Manual publishing
+
+Publishingni qo'lda ham ishga tushirish mumkin:
+
+1. **Actions → Publish Package** ga o'ting
+2. **"Run workflow"** tugmasini bosing
+3. `dev` branchni tanlang
+4. **"Run workflow"** ni bosing
+
+### CI ni o'tkazib yuborish
+
+Agar `dev` ga push qilayotganda publish workflow ishlamasligi kerak bo'lsa, commit message ga `[skip ci]` qo'shing:
+
+```bash
+git commit -m "docs: readme yangilandi [skip ci]"
+```
+
+## Development
+
+### Build
+
+```bash
+npm run build
+```
+
+### Versioning
+
+Version bump CI/CD pipeline tomonidan avtomatik boshqariladi. Merge qilishdan oldin versiyani qo'lda o'zgartirish **shart emas**.
+
+## Project Structure
+
+```
+src/
+├── decorators/     # Custom decoratorlar (roles, current user)
+├── dto/            # Umumiy DTOlar
+├── enums/          # Umumiy enumlar (roles, trip status, payment, va h.k.)
+├── prompt/         # Error prompt utilitylari
+└── proto/          # Protobuf definitionlar va path helperlar
+```

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

@@ -4,5 +4,6 @@ export declare class CreateTripDto {
     clientLongitude: number;
     destinationLatitude?: number;
     destinationLongitude?: number;
+    carClassId: string;
     paymentMethod: PaymentMethod;
 }

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

@@ -71,6 +71,15 @@ __decorate([
     (0, class_validator_1.Max)(180),
     __metadata("design:type", Number)
 ], CreateTripDto.prototype, "destinationLongitude", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        description: 'Car class ID',
+        example: '550e8400-e29b-41d4-a716-446655440000',
+    }),
+    (0, class_validator_1.IsNotEmpty)(),
+    (0, class_validator_1.IsUUID)(),
+    __metadata("design:type", String)
+], CreateTripDto.prototype, "carClassId", void 0);
 __decorate([
     (0, swagger_1.ApiProperty)({
         description: 'Payment method',

package/dist/index.d.ts

@@ -31,3 +31,4 @@ 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';

package/dist/index.js

@@ -48,3 +48,4 @@ __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);

package/dist/proto/car-class-proto-path.d.ts

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

package/dist/proto/car-class-proto-path.js

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

package/dist/proto/car-class-proto-path.ts

@@ -0,0 +1,3 @@
+declare const __dirname: string;
+
+export const carClassProtoPath = `${__dirname}/car-class.proto`;

package/dist/proto/car-class.proto

@@ -0,0 +1,98 @@
+syntax = "proto3";
+
+package car_class;
+
+import "common.proto";
+
+// ==========================================
+// 1. SERVICES
+// ==========================================
+service CarClassService {
+  rpc CreateCarClass (CreateCarClassRequest) returns (CarClassResponse);
+  rpc UpdateCarClass (UpdateCarClassRequest) returns (CarClassResponse);
+  rpc DeleteCarClass (common.IdRequest) returns (common.SuccessResponseResult);
+  // Public — faqat name qaytadi
+  rpc GetAllCarClasses (common.NoParams) returns (CarClassPublicListResponse);
+  rpc GetCarClassById (common.IdRequest) returns (CarClassPublicResponse);
+  // Admin — to'liq data
+  rpc GetAllCarClassesAdmin (common.NoParams) returns (CarClassListResponse);
+  rpc GetCarClassByIdAdmin (common.IdRequest) returns (CarClassResponse);
+  // Service-to-service — narx olish (ServiceOnly)
+  rpc GetCarClassPricing (common.IdRequest) returns (CarClassPricingResponse);
+}
+
+// ==========================================
+// 2. REQUESTS
+// ==========================================
+message CreateCarClassRequest {
+  string name = 1;
+  string description = 2;
+  float basePrice = 3;
+  float pricePerKm = 4;
+  optional string image_url = 5;
+}
+
+message UpdateCarClassRequest {
+  string id = 1;
+  optional string name = 2;
+  optional string description = 3;
+  optional float basePrice = 4;
+  optional float pricePerKm = 5;
+  optional string image_url = 6;
+}
+
+// ==========================================
+// 3. RESPONSES
+// ==========================================
+
+// Public — id, name va imageUrl
+message CarClassPublicData {
+  string id = 1;
+  string name = 2;
+  optional string image_url = 3;
+  float basePrice = 4;
+}
+
+message CarClassPublicResponse {
+  int32 statusCode = 1;
+  string message = 2;
+  CarClassPublicData data = 3;
+}
+
+message CarClassPublicListResponse {
+  int32 statusCode = 1;
+  string message = 2;
+  repeated CarClassPublicData data = 3;
+}
+
+// Admin — to'liq data
+message CarClassData {
+  string id = 1;
+  string name = 2;
+  string description = 3;
+  float basePrice = 4;
+  float pricePerKm = 5;
+  bool isActive = 6;
+  string createdAt = 7;
+  optional string image_url = 8;
+}
+
+message CarClassResponse {
+  int32 statusCode = 1;
+  string message = 2;
+  CarClassData data = 3;
+}
+
+message CarClassListResponse {
+  int32 statusCode = 1;
+  string message = 2;
+  repeated CarClassData data = 3;
+}
+
+// Service-to-service — narx ma'lumotlari
+message CarClassPricingResponse {
+  int32 statusCode = 1;
+  string message = 2;
+  float basePrice = 3;
+  float pricePerKm = 4;
+}

package/dist/proto/matching.proto

@@ -21,6 +21,7 @@ message SearchNearbyDriversRequest {
   double lng = 2;           // Longitude (-180 dan 180 gacha)
   optional int32 limit = 3; // Max natijalar soni (default: 10, max: 50)
   optional double radius_km = 4; // Qidiruv radiusi km da (default: 5, max: 100)
+  optional string car_class_id = 5; // CarClass bo'yicha filter
 }
 
 message NearbyDriver {

package/dist/proto/trip.proto

@@ -53,6 +53,7 @@ message CreateTripRequest {
   optional float destinationLatitude = 5;
   optional float destinationLongitude = 6;
   string paymentMethod = 7;
+  string carClassId = 8;
 }
 
 message TripActionRequest {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devline-smart-taxi/common",
-  "version": "2.3.26",
+  "version": "2.3.28",
   "description": "Reusable NestJS common library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -24,7 +24,8 @@
     "typescript": "^5.9.3"
   },
   "publishConfig": {
-    "registry": "https://npm.pkg.github.com"
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
     "@nestjs/mapped-types": "^2.1.0",