@barumetric/contracts 1.4.21 → 1.4.23

package/gen/ts/categories.ts

@@ -31,7 +31,8 @@ export interface GetCategoryRequest {
 }
 
 export interface GetCategoryAttributesRequest {
-  id: string;
+  categoryId: string;
+  visibleInForm?: boolean | undefined;
 }
 
 export interface GetAllCategoriesResponse {
@@ -72,7 +73,7 @@ export interface CategoryAttribute {
   type: AttributeType;
   isRequired: boolean;
   isFilterable: boolean;
-  inherited: boolean;
+  isVisibleInForm: boolean;
   unit?: string | undefined;
   minValue?: number | undefined;
   maxValue?: number | undefined;
@@ -150,8 +151,6 @@ export interface Attribute {
   name: string;
   key: string;
   type: AttributeType;
-  defaultIsRequired: boolean;
-  defaultIsFilterable: boolean;
   unit?: string | undefined;
   minValue?: number | undefined;
   maxValue?: number | undefined;
@@ -162,8 +161,6 @@ export interface CreateAttributeRequest {
   name: string;
   key: string;
   type: AttributeType;
-  defaultIsRequired: boolean;
-  defaultIsFilterable: boolean;
   unit?: string | undefined;
   minValue?: number | undefined;
   maxValue?: number | undefined;
@@ -180,8 +177,6 @@ export interface UpdateAttributeRequest {
   name?: string | undefined;
   key?: string | undefined;
   type?: AttributeType | undefined;
-  defaultIsRequired?: boolean | undefined;
-  defaultIsFilterable?: boolean | undefined;
   unit?: string | undefined;
   minValue?: number | undefined;
   maxValue?: number | undefined;
@@ -206,6 +201,7 @@ export interface AssignAttributeToCategoryRequest {
   attributeId: string;
   isRequired?: boolean | undefined;
   isFilterable?: boolean | undefined;
+  isVisibleInForm?: boolean | undefined;
   sortOrder?: number | undefined;
 }
 

package/gen/ts/listings.ts

@@ -6,9 +6,8 @@
 
 /* eslint-disable */
 import { GrpcMethod, GrpcStreamMethod } from "@nestjs/microservices";
-import { wrappers } from "protobufjs";
 import { Observable } from "rxjs";
-import { Struct } from "./google/protobuf/struct";
+import { Timestamp } from "./google/protobuf/timestamp";
 
 export const protobufPackage = "listings.v1";
 
@@ -44,9 +43,10 @@ export interface CreateListingRequest {
   categoryId: string;
   latitude?: number | undefined;
   longitude?: number | undefined;
+  address?: string | undefined;
   videoUrl?: string | undefined;
   status?: string | undefined;
-  attributes?: { [key: string]: any } | undefined;
+  attributes: AttributeValue[];
 }
 
 export interface CreateListingResponse {
@@ -62,9 +62,10 @@ export interface UpdateListingRequest {
   categoryId: string;
   latitude?: number | undefined;
   longitude?: number | undefined;
+  address?: string | undefined;
   videoUrl?: string | undefined;
   status?: string | undefined;
-  attributes?: { [key: string]: any } | undefined;
+  attributes: AttributeValue[];
 }
 
 export interface UpdateListingResponse {
@@ -120,22 +121,36 @@ export interface Listing {
   userId: string;
   latitude?: number | undefined;
   longitude?: number | undefined;
+  address?: string | undefined;
   videoUrl?: string | undefined;
   status: ListingStatus;
   viewsCount: number;
   favoritesCount: number;
   imagesCount: number;
   /** JSON строка */
-  attributes: string;
+  attributes: AttributeValue[];
   createdAt: string;
   updatedAt: string;
   publishedAt?: string | undefined;
   deletedAt?: string | undefined;
 }
 
-export const LISTINGS_V1_PACKAGE_NAME = "listings.v1";
+export interface AttributeValue {
+  attributeId: string;
+  enumValueId?: string | undefined;
+  enumValueIds: string[];
+  stringValue?: string | undefined;
+  stringValues: string[];
+  textValue?: string | undefined;
+  integerValue?: number | undefined;
+  floatValue?: number | undefined;
+  booleanValue?: boolean | undefined;
+  dateValue?: Timestamp | undefined;
+  rangeMin?: number | undefined;
+  rangeMax?: number | undefined;
+}
 
-wrappers[".google.protobuf.Struct"] = { fromObject: Struct.wrap, toObject: Struct.unwrap } as any;
+export const LISTINGS_V1_PACKAGE_NAME = "listings.v1";
 
 export interface ListingsServiceClient {
   getListing(request: GetListingRequest): Observable<GetListingResponse>;

package/gen/ts/presence.ts

@@ -60,6 +60,19 @@ export interface IsUserOnlineResponse {
   isOnline: boolean;
 }
 
+export interface GetUsersOnlineStatusRequest {
+  userIds: string[];
+}
+
+export interface GetUsersOnlineStatusResponse {
+  statuses: UserOnlineStatus[];
+}
+
+export interface UserOnlineStatus {
+  userId: string;
+  isOnline: boolean;
+}
+
 export const PRESENCE_V1_PACKAGE_NAME = "presence.v1";
 
 export interface PresenceServiceClient {
@@ -74,6 +87,8 @@ export interface PresenceServiceClient {
   getUserBySocket(request: GetUserBySocketRequest): Observable<GetUserBySocketResponse>;
 
   isUserOnline(request: IsUserOnlineRequest): Observable<IsUserOnlineResponse>;
+
+  getUsersOnlineStatus(request: GetUsersOnlineStatusRequest): Observable<GetUsersOnlineStatusResponse>;
 }
 
 export interface PresenceServiceController {
@@ -100,6 +115,10 @@ export interface PresenceServiceController {
   isUserOnline(
     request: IsUserOnlineRequest,
   ): Promise<IsUserOnlineResponse> | Observable<IsUserOnlineResponse> | IsUserOnlineResponse;
+
+  getUsersOnlineStatus(
+    request: GetUsersOnlineStatusRequest,
+  ): Promise<GetUsersOnlineStatusResponse> | Observable<GetUsersOnlineStatusResponse> | GetUsersOnlineStatusResponse;
 }
 
 export function PresenceServiceControllerMethods() {
@@ -111,6 +130,7 @@ export function PresenceServiceControllerMethods() {
       "removeUserSocket",
       "getUserBySocket",
       "isUserOnline",
+      "getUsersOnlineStatus",
     ];
     for (const method of grpcMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);

package/gen/ts/users.ts

@@ -120,6 +120,8 @@ export interface UserLite {
   /** Базовые поля */
   name?: string | undefined;
   avatar?: string | undefined;
+  reviewsCount: number;
+  averageRating: number;
 }
 
 export interface User {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@barumetric/contracts",
-	"version": "1.4.21",
+	"version": "1.4.23",
 	"description": "Protobuf definitions and generated TypeScript types",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",

package/proto/categories.proto

@@ -7,6 +7,7 @@ import "google/protobuf/empty.proto";
 service CategoriesService {
 	rpc GetAllCategories (google.protobuf.Empty) returns (GetAllCategoriesResponse);
 	rpc GetCategory (GetCategoryRequest) returns (GetCategoryResponse);
+	rpc GetCategoryBySlug (GetCategoryBySlugRequest) returns (GetCategoryBySlugResponse);
 	rpc GetCategoryAttributes (GetCategoryAttributesRequest) returns (GetCategoryAttributesResponse);
 
 	rpc CreateCategory (CreateCategoryRequest) returns (CreateCategoryResponse);
@@ -30,8 +31,14 @@ message GetCategoryRequest {
 	bool include_attributes = 2;
 }
 
+message GetCategoryBySlugRequest {
+	string slug = 1;
+	bool include_attributes = 2;
+}
+
 message GetCategoryAttributesRequest {
-	string id = 1;
+	string category_id = 1;
+	optional bool visible_in_form = 2;
 }
 
 message GetAllCategoriesResponse {
@@ -42,6 +49,10 @@ message GetCategoryResponse {
 	Category category = 1;
 }
 
+message GetCategoryBySlugResponse {
+	Category category = 1;
+}
+
 message GetCategoryAttributesResponse {
 	repeated CategoryAttribute attributes = 1;
 }
@@ -72,7 +83,7 @@ message CategoryAttribute {
 	AttributeType type = 5;
 	bool is_required = 6;
 	bool is_filterable = 7;
-	bool inherited = 8;
+	bool is_visible_in_form = 8;
 	optional string unit = 9;
 	optional float min_value = 10;
 	optional float max_value = 11;
@@ -163,24 +174,20 @@ message Attribute {
 	string name = 2;
 	string key = 3;
 	AttributeType type = 4;
-	bool default_is_required = 5;
-	bool default_is_filterable = 6;
-	optional string unit = 7;
-	optional float min_value = 8;
-	optional float max_value = 9;
-	repeated EnumValue enum_values = 10;
+	optional string unit = 5;
+	optional float min_value = 6;
+	optional float max_value = 7;
+	repeated EnumValue enum_values = 8;
 }
 
 message CreateAttributeRequest {
 	string name = 1;
 	string key = 2;
 	AttributeType type = 3;
-	bool default_is_required = 4;
-	bool default_is_filterable = 5;
-	optional string unit = 6;
-	optional float min_value = 7;
-	optional float max_value = 8;
-	repeated EnumValueInput enum_values = 9;
+	optional string unit = 4;
+	optional float min_value = 5;
+	optional float max_value = 6;
+	repeated EnumValueInput enum_values = 7;
 }
 
 message CreateAttributeResponse {
@@ -193,12 +200,10 @@ message UpdateAttributeRequest {
 	optional string name = 2;
 	optional string key = 3;
 	optional AttributeType type = 4;
-	optional bool default_is_required = 5;
-	optional bool default_is_filterable = 6;
-	optional string unit = 7;
-	optional float min_value = 8;
-	optional float max_value = 9;
-	repeated EnumValueInput enum_values = 10;
+	optional string unit = 5;
+	optional float min_value = 6;
+	optional float max_value = 7;
+	repeated EnumValueInput enum_values = 8;
 }
 
 message UpdateAttributeResponse {
@@ -219,7 +224,8 @@ message AssignAttributeToCategoryRequest {
 	string attribute_id = 2;
 	optional bool is_required = 3;
 	optional bool is_filterable = 4;
-	optional int32 sort_order = 5;
+	optional bool is_visible_in_form = 5;
+	optional int32 sort_order = 6;
 }
 
 message AssignAttributeToCategoryResponse {

package/proto/listings.proto

@@ -2,8 +2,7 @@ syntax = "proto3";
 
 package listings.v1;
 
-import "google/protobuf/empty.proto";
-import "google/protobuf/struct.proto";
+import "google/protobuf/timestamp.proto";
 
 service ListingsService {
 	rpc GetListing (GetListingRequest) returns (GetListingResponse);
@@ -23,9 +22,10 @@ message CreateListingRequest {
 	string category_id = 5;
 	optional float latitude = 6;
 	optional float longitude = 7;
-	optional string video_url = 8;
-	optional string status = 9;
-	optional google.protobuf.Struct attributes = 10;
+	optional string address = 8;
+	optional string video_url = 9;
+	optional string status = 10;
+	repeated AttributeValue attributes = 11;
 }
 
 message CreateListingResponse {
@@ -41,9 +41,10 @@ message UpdateListingRequest {
 	string category_id = 6;
 	optional float latitude = 7;
 	optional float longitude = 8;
-	optional string video_url = 9;
-	optional string status = 10;
-	optional google.protobuf.Struct attributes = 11;
+	optional string address = 9;
+	optional string video_url = 10;
+	optional string status = 11;
+	repeated AttributeValue attributes = 12;
 }
 
 message UpdateListingResponse {
@@ -99,16 +100,32 @@ message Listing {
 	string user_id = 6;
 	optional float latitude = 7;
 	optional float longitude = 8;
-	optional string video_url = 9;
-	ListingStatus status = 10;
-	int64 views_count = 11;
-	int64 favorites_count = 12;
-	int32 images_count = 13;
-	string attributes = 14; // JSON строка
-	string created_at = 15;
-	string updated_at = 16;
-	optional string published_at = 17;
-	optional string deleted_at = 18;
+	optional string address = 9;
+	optional string video_url = 10;
+	ListingStatus status = 11;
+	int64 views_count = 12;
+	int64 favorites_count = 13;
+	int32 images_count = 14;
+	repeated AttributeValue attributes = 15;
+	string created_at = 16;
+	string updated_at = 17;
+	optional string published_at = 18;
+	optional string deleted_at = 19;
+}
+
+message AttributeValue {
+	string attribute_id = 1;
+	optional string enum_value_id = 2;
+	repeated string enum_value_ids = 3;
+	optional string string_value = 4;
+	repeated string string_values = 5;
+	optional string text_value = 6;
+	optional int32 integer_value = 7;
+	optional float float_value = 8;
+	optional bool boolean_value = 9;
+	optional google.protobuf.Timestamp date_value = 10;
+	optional float range_min = 11;
+	optional float range_max = 12;
 }
 
 // Статусы объявлений

package/proto/presence.proto

@@ -2,8 +2,6 @@ syntax = "proto3";
 
 package presence.v1;
 
-import "google/protobuf/timestamp.proto";
-
 service PresenceService {
   rpc SetUserSocket (SetUserSocketRequest) returns (SetUserSocketResponse);
   rpc GetUserSocket (GetUserSocketRequest) returns (GetUserSocketResponse);
@@ -11,6 +9,7 @@ service PresenceService {
   rpc RemoveUserSocket (RemoveUserSocketRequest) returns (RemoveUserSocketResponse);
   rpc GetUserBySocket (GetUserBySocketRequest) returns (GetUserBySocketResponse);
   rpc IsUserOnline (IsUserOnlineRequest) returns (IsUserOnlineResponse);
+  rpc GetUsersOnlineStatus (GetUsersOnlineStatusRequest) returns (GetUsersOnlineStatusResponse);
   
 }
 
@@ -62,4 +61,17 @@ message IsUserOnlineRequest {
 
 message IsUserOnlineResponse {
   bool is_online = 1;
-}
+}
+
+message GetUsersOnlineStatusRequest {
+  repeated string user_ids = 1;
+}
+
+message GetUsersOnlineStatusResponse {
+  repeated UserOnlineStatus statuses = 1;
+}
+
+message UserOnlineStatus {
+  string user_id    = 1;
+  bool   is_online  = 2;
+}

package/proto/users.proto

@@ -84,6 +84,9 @@ message UserLite {
 	// Базовые поля
 	optional string name = 2;
 	optional string avatar = 3;
+
+	int32 reviews_count = 4;
+	float average_rating = 5;
 }
 
 message User {