T #98 fixed proto files

HueByte · Oct 6, 2022 · d74266e · d74266e
1 parent a97490b
commit d74266e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/src/HuppyService/HuppyService.Infrastructure/HuppyService.Infrastructure.csproj b/src/HuppyService/HuppyService.Infrastructure/HuppyService.Infrastructure.csproj
@@ -13,4 +13,8 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Migrations\" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/HuppyService/HuppyService.Service/HuppyService.Service.csproj b/src/HuppyService/HuppyService.Service/HuppyService.Service.csproj
@@ -10,7 +10,7 @@
     <Protobuf Include="Protos\commandLog.proto" GrpcServices="Server" />
     <Protobuf Include="Protos\gpt.proto" GrpcServices="Server" />
     <Protobuf Include="Protos\greet.proto" GrpcServices="Server" />
-    <Protobuf Include="Protos\models\database.proto" GrpcServices="Server" />
+    <Protobuf Include="Protos\database.proto" GrpcServices="Server" />
     <Protobuf Include="Protos\server.proto" GrpcServices="Server" />
   </ItemGroup>
 

diff --git a/src/HuppyService/HuppyService.Service/Protos/commandLog.proto b/src/HuppyService/HuppyService.Service/Protos/commandLog.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 option csharp_namespace = "HuppyService.Service.Protos";
 
 import "google/protobuf/empty.proto";
-import "Protos/models/database.proto"; 
+import "Protos/database.proto"; 
 
 package CommandLogProto;
 
@@ -12,7 +12,7 @@ service CommandLogProto {
 	rpc GetAverageExecutionTime(google.protobuf.Empty) returns (AverageTimeResponse);
     rpc GetAiUsage(google.protobuf.Empty) returns (AiUsageResponse);
     rpc AddCommand(database.models.CommandLogModel) returns (database.models.CommandLogModel);
-    rpc RemoveCommand(database.models.CommandLogModel) returns (CommandLogResponse);
+    rpc RemoveCommand(database.models.CommandLogModel) returns (database.models.CommonResponse);
 }
 
 message CommandLogCount {
@@ -25,8 +25,4 @@ message AverageTimeResponse {
 
 message AiUsageResponse {
     map<uint64, int32> AiUsers = 1;
-}
-
-message CommandLogResponse {
-    bool IsSuccess = 1;
 }
diff --git a/...vice.Service/Protos/models/database.proto → ...uppyService.Service/Protos/database.proto b/...vice.Service/Protos/models/database.proto → ...uppyService.Service/Protos/database.proto
@@ -22,7 +22,7 @@ message ServerModel {
     bool UseGreet = 3;
     string GreetMessage = 4;
     uint64 RoleId = 5;
-    uint64 ServerRommsId = 6;
+    uint64 ServerRoomsId = 6;
     ServerRoomsModel Rooms = 7;
 }
 
@@ -31,4 +31,8 @@ message ServerRoomsModel {
     uint64 OutputRoom = 2;
     uint64 GreetingRoom = 3;
     uint64 ServerId = 4;
+}
+
+message CommonResponse {
+    bool IsSuccess = 1;
 }
diff --git a/src/HuppyService/HuppyService.Service/Protos/server.proto b/src/HuppyService/HuppyService.Service/Protos/server.proto
@@ -3,16 +3,21 @@ syntax = "proto3";
 option csharp_namespace = "HuppyService.Service.Protos";
 
 import "google/protobuf/empty.proto";
-import "Protos/models/database.proto";
+import "Protos/database.proto";
 
 package ServerProto;
 
 service ServerProto {
+    rpc Get(ServerIdInput) returns (database.models.ServerModel);
     rpc GetOrCreate(GetOrCreateServerInput) returns (database.models.ServerModel);
-    rpc UpdateAsync(database.models.ServerModel) returns(ServerProtoDefaultResponse);
+    rpc Update(database.models.ServerModel) returns(database.models.CommonResponse);
     rpc GetAll(google.protobuf.Empty) returns (ServerModelCollection);
 }
 
+message ServerIdInput {
+    uint64 Id = 1;
+}
+
 message ServerModelCollection {
     repeated database.models.ServerModel ServerModel= 1;
 }
@@ -21,8 +26,4 @@ message GetOrCreateServerInput {
 	uint64 Id = 1;
 	string ServerName = 2;
     uint64 DefaultChannel = 3;
-}
-
-message ServerProtoDefaultResponse {
-    bool IsSuccess = 1;
 }