@thiscargo/contracts 0.0.12 → 0.0.14

package/gen/account.ts

@@ -12,6 +12,10 @@ import { RoleResponse } from "./role";
 
 export const protobufPackage = "account.v1";
 
+export interface GetAccountRequest {
+  id: string;
+}
+
 export interface AccountResponse {
   id: string;
   tId?: number | undefined;
@@ -27,10 +31,6 @@ export interface AccountResponse {
   role?: RoleResponse | undefined;
 }
 
-export interface GetAccountRequest {
-  id: string;
-}
-
 export const ACCOUNT_V1_PACKAGE_NAME = "account.v1";
 
 export interface AccountServiceClient {

package/gen/auth.ts

@@ -11,10 +11,14 @@ import { Observable } from "rxjs";
 export const protobufPackage = "auth.v1";
 
 export interface RegisterRequest {
+  companyId?: string | undefined;
+  roleId?: string | undefined;
+  phone: string;
   firstName: string;
   lastName: string;
-  phone: string;
+  middleName?: string | undefined;
   password: string;
+  isActive: boolean;
 }
 
 export interface RegisterResponse {

package/gen/company.ts

@@ -5,11 +5,38 @@
 // source: company.proto
 
 /* eslint-disable */
+import { GrpcMethod, GrpcStreamMethod } from "@nestjs/microservices";
+import { Observable } from "rxjs";
 import { AccountResponse } from "./account";
+import { Empty } from "./google/protobuf/empty";
 import { Timestamp } from "./google/protobuf/timestamp";
 
 export const protobufPackage = "company.v1";
 
+export interface CreateCompanyRequest {
+  serverId: string;
+  name: string;
+  phone: string;
+  address: string;
+  botToken: string;
+}
+
+export interface GetCompanyRequest {
+  id: string;
+}
+
+export interface UpdateCompanyRequest {
+  id: string;
+  name?: string | undefined;
+  phone?: string | undefined;
+  address?: string | undefined;
+  botToken?: string | undefined;
+}
+
+export interface DeleteCompanyRequest {
+  id: string;
+}
+
 export interface CompanyResponse {
   id: string;
   serverId: string;
@@ -28,3 +55,44 @@ export interface CompanyResponse_CompanyCount {
 }
 
 export const COMPANY_V1_PACKAGE_NAME = "company.v1";
+
+export interface CompanyServiceClient {
+  createCompany(request: CreateCompanyRequest): Observable<CompanyResponse>;
+
+  getCompany(request: GetCompanyRequest): Observable<CompanyResponse>;
+
+  updateCompany(request: UpdateCompanyRequest): Observable<CompanyResponse>;
+
+  deleteCompany(request: DeleteCompanyRequest): Observable<Empty>;
+}
+
+export interface CompanyServiceController {
+  createCompany(
+    request: CreateCompanyRequest,
+  ): Promise<CompanyResponse> | Observable<CompanyResponse> | CompanyResponse;
+
+  getCompany(request: GetCompanyRequest): Promise<CompanyResponse> | Observable<CompanyResponse> | CompanyResponse;
+
+  updateCompany(
+    request: UpdateCompanyRequest,
+  ): Promise<CompanyResponse> | Observable<CompanyResponse> | CompanyResponse;
+
+  deleteCompany(request: DeleteCompanyRequest): void | Promise<void>;
+}
+
+export function CompanyServiceControllerMethods() {
+  return function (constructor: Function) {
+    const grpcMethods: string[] = ["createCompany", "getCompany", "updateCompany", "deleteCompany"];
+    for (const method of grpcMethods) {
+      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+      GrpcMethod("CompanyService", method)(constructor.prototype[method], method, descriptor);
+    }
+    const grpcStreamMethods: string[] = [];
+    for (const method of grpcStreamMethods) {
+      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+      GrpcStreamMethod("CompanyService", method)(constructor.prototype[method], method, descriptor);
+    }
+  };
+}
+
+export const COMPANY_SERVICE_NAME = "CompanyService";

package/gen/google/protobuf/empty.ts

@@ -0,0 +1,23 @@
+// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
+// versions:
+//   protoc-gen-ts_proto  v2.11.2
+//   protoc               v6.33.5
+// source: google/protobuf/empty.proto
+
+/* eslint-disable */
+
+export const protobufPackage = "google.protobuf";
+
+/**
+ * A generic empty message that you can re-use to avoid defining duplicated
+ * empty messages in your APIs. A typical example is to use it as the request
+ * or the response type of an API method. For instance:
+ *
+ *     service Foo {
+ *       rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty);
+ *     }
+ */
+export interface Empty {
+}
+
+export const GOOGLE_PROTOBUF_PACKAGE_NAME = "google.protobuf";

package/gen/server.ts

@@ -5,29 +5,87 @@
 // source: server.proto
 
 /* eslint-disable */
+import { GrpcMethod, GrpcStreamMethod } from "@nestjs/microservices";
+import { Observable } from "rxjs";
 import { CompanyResponse } from "./company";
+import { Empty } from "./google/protobuf/empty";
 import { Timestamp } from "./google/protobuf/timestamp";
 
 export const protobufPackage = "server.v1";
 
-export interface Server {
+export interface CreateServerRequest {
+  name: string;
+  host: string;
+  port: number;
+}
+
+export interface GetServerRequest {
+  id: string;
+}
+
+export interface UpdateServerRequest {
+  id: string;
+  name?: string | undefined;
+  host?: string | undefined;
+  port?: number | undefined;
+  isActive?: boolean | undefined;
+}
+
+export interface DeleteServerRequest {
+  id: string;
+}
+
+export interface ServerResponse {
   id: string;
   name: string;
   host: string;
   port: number;
   isActive: boolean;
   createdAt: Timestamp | undefined;
-  updatedAt:
-    | Timestamp
-    | undefined;
-  /** Связи */
+  updatedAt: Timestamp | undefined;
   companies: CompanyResponse[];
-  Count?: Server_ServerCount | undefined;
+  Count?: ServerResponse_ServerCount | undefined;
 }
 
-/** Метаданные Prisma _count */
-export interface Server_ServerCount {
+export interface ServerResponse_ServerCount {
   companies: number;
 }
 
 export const SERVER_V1_PACKAGE_NAME = "server.v1";
+
+export interface ServerServiceClient {
+  createServer(request: CreateServerRequest): Observable<ServerResponse>;
+
+  getServer(request: GetServerRequest): Observable<ServerResponse>;
+
+  updateServer(request: UpdateServerRequest): Observable<ServerResponse>;
+
+  deleteServer(request: DeleteServerRequest): Observable<Empty>;
+}
+
+export interface ServerServiceController {
+  createServer(request: CreateServerRequest): Promise<ServerResponse> | Observable<ServerResponse> | ServerResponse;
+
+  getServer(request: GetServerRequest): Promise<ServerResponse> | Observable<ServerResponse> | ServerResponse;
+
+  updateServer(request: UpdateServerRequest): Promise<ServerResponse> | Observable<ServerResponse> | ServerResponse;
+
+  deleteServer(request: DeleteServerRequest): void | Promise<void>;
+}
+
+export function ServerServiceControllerMethods() {
+  return function (constructor: Function) {
+    const grpcMethods: string[] = ["createServer", "getServer", "updateServer", "deleteServer"];
+    for (const method of grpcMethods) {
+      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+      GrpcMethod("ServerService", method)(constructor.prototype[method], method, descriptor);
+    }
+    const grpcStreamMethods: string[] = [];
+    for (const method of grpcStreamMethods) {
+      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+      GrpcStreamMethod("ServerService", method)(constructor.prototype[method], method, descriptor);
+    }
+  };
+}
+
+export const SERVER_SERVICE_NAME = "ServerService";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thiscargo/contracts",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "description": "Protobuf definitions and generated TypeScript types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,6 +18,7 @@
   },
   "dependencies": {
     "@nestjs/microservices": "^11.1.13",
+    "@thiscargo/contracts": "^0.0.13",
     "rxjs": "^7.8.2"
   },
   "devDependencies": {

package/proto/account.proto

@@ -5,6 +5,13 @@ package account.v1;
 import "google/protobuf/timestamp.proto";
 import "role.proto";
 
+service AccountService {
+  rpc GetAccount(GetAccountRequest) returns (AccountResponse);
+}
+
+message GetAccountRequest {
+  string id = 1;
+}
 message AccountResponse {
   string id = 1;
   optional int64 t_id = 2;
@@ -19,12 +26,4 @@ message AccountResponse {
   google.protobuf.Timestamp updated_at = 11;
 
   optional role.v1.RoleResponse role = 13;
-}
-
-service AccountService {
-  rpc GetAccount(GetAccountRequest) returns (AccountResponse);
-}
-
-message GetAccountRequest {
-  string id = 1;
 }

package/proto/auth.proto

@@ -9,10 +9,14 @@ service AuthService {
 }
 
 message RegisterRequest {
-  string first_name = 1;
-  string last_name = 2;
+  optional string company_id = 1;
+  optional string role_id = 2;
   string phone = 3;
-  string password = 4;
+  string first_name = 4;
+  string last_name = 5;
+  optional string middle_name = 6;
+  string password = 7;
+  bool is_active = 8;
 }
 
 message RegisterResponse {

package/proto/company.proto

@@ -3,8 +3,40 @@ syntax = "proto3";
 package company.v1;
 
 import "google/protobuf/timestamp.proto";
+import "google/protobuf/empty.proto";
 import "account.proto";
 
+service CompanyService {
+  rpc CreateCompany(CreateCompanyRequest) returns (CompanyResponse);
+  rpc GetCompany(GetCompanyRequest) returns (CompanyResponse);
+  rpc UpdateCompany(UpdateCompanyRequest) returns (CompanyResponse);
+  rpc DeleteCompany(DeleteCompanyRequest) returns (google.protobuf.Empty);
+}
+
+message CreateCompanyRequest {
+  string server_id = 1;
+  string name = 2;
+  string phone = 3;
+  string address = 4;
+  string bot_token = 5;
+}
+
+message GetCompanyRequest {
+  string id = 1;
+}
+
+message UpdateCompanyRequest {
+  string id = 1;
+  optional string name = 3;
+  optional string phone = 4;
+  optional string address = 5;
+  optional string bot_token = 6;
+}
+
+message DeleteCompanyRequest {
+  string id = 1;
+}
+
 message CompanyResponse {
   string id = 1;
   string server_id = 2;

package/proto/server.proto

@@ -3,9 +3,39 @@ syntax = "proto3";
 package server.v1;
 
 import "google/protobuf/timestamp.proto";
-import "company.proto"; // Импорт для связи
+import "google/protobuf/empty.proto";
+import "company.proto";
 
-message Server {
+service ServerService {
+  rpc CreateServer (CreateServerRequest) returns (ServerResponse);
+  rpc GetServer (GetServerRequest) returns (ServerResponse);
+  rpc UpdateServer (UpdateServerRequest) returns (ServerResponse);
+  rpc DeleteServer (DeleteServerRequest) returns (google.protobuf.Empty);
+}
+
+message CreateServerRequest {
+  string name = 1;
+  string host = 2;
+  int32 port = 3;
+}
+
+message GetServerRequest {
+  string id = 1;
+}
+
+message UpdateServerRequest {
+  string id = 1;
+  optional string name = 2;
+  optional string host = 3;
+  optional int32 port = 4;
+  optional bool is_active = 5;
+}
+
+message DeleteServerRequest {
+  string id = 1;
+}
+
+message ServerResponse {
   string id = 1;
   string name = 2;
   string host = 3;
@@ -14,10 +44,8 @@ message Server {
   google.protobuf.Timestamp created_at = 6;
   google.protobuf.Timestamp updated_at = 7;
 
-  // Связи
   repeated company.v1.CompanyResponse companies = 9;
 
-  // Метаданные Prisma _count
   message ServerCount {
     int32 companies = 1;
   }