fix: ts-proto snake_case to camelCase, Chat.gRPC.createRoom() empty i…

…d res field (#770)
ConduitPlatform · Oct 26, 2023 · 510b2be · 510b2be
1 parent 1f7d31f
commit 510b2be
Show file tree

Hide file tree

Showing 17 changed files with 40 additions and 25 deletions.
diff --git a/libraries/grpc-sdk/build.sh b/libraries/grpc-sdk/build.sh
@@ -13,6 +13,7 @@ protoc \
   --ts_proto_opt=esModuleInterop=true \
   --ts_proto_opt=outputServices=generic-definitions,exportCommonSymbols=false,useExactTypes=false \
   --ts_proto_out=./ \
+  --ts_proto_opt=snakeToCamel=false \
   ./*.proto
 
 # Initialize the content of the index.ts file

diff --git a/libraries/grpc-sdk/src/modules/chat/index.ts b/libraries/grpc-sdk/src/modules/chat/index.ts
@@ -2,7 +2,11 @@ import { ConduitModule } from '../../classes/ConduitModule';
 import { ChatDefinition, Room, SendMessageRequest } from '../../protoUtils/chat';
 
 export class Chat extends ConduitModule<typeof ChatDefinition> {
-  constructor(private readonly moduleName: string, url: string, grpcToken?: string) {
+  constructor(
+    private readonly moduleName: string,
+    url: string,
+    grpcToken?: string,
+  ) {
     super(moduleName, 'chat', url, grpcToken);
     this.initializeClient(ChatDefinition);
   }
@@ -16,6 +20,6 @@ export class Chat extends ConduitModule<typeof ChatDefinition> {
   }
 
   deleteRoom(id: string): Promise<Room> {
-    return this.client!.deleteRoom({ id });
+    return this.client!.deleteRoom({ _id: id });
   }
 }
diff --git a/libraries/testing-tools/build.sh b/libraries/testing-tools/build.sh
@@ -12,6 +12,7 @@ protoc \
   --ts_proto_opt=esModuleInterop=true \
   --ts_proto_opt=outputServices=generic-definitions,useExactTypes=false \
   --ts_proto_out=./ \
+  --ts_proto_opt=snakeToCamel=false \
   ./*.proto
 
 echo "Cleaning up protofiles"

diff --git a/modules/authentication/build.sh b/modules/authentication/build.sh
@@ -11,7 +11,8 @@ protoc \
   --plugin=../../node_modules/.bin/protoc-gen-ts_proto\
   --ts_proto_opt=esModuleInterop=true \
   --ts_proto_out=./ \
-  --ts_proto_opt=outputServices=generic-definitions,useExactTypes=false\
+  --ts_proto_opt=outputServices=generic-definitions,useExactTypes=false \
+  --ts_proto_opt=snakeToCamel=false \
   ./*.proto
 
 echo "Cleaning up folders"

diff --git a/modules/authorization/build.sh b/modules/authorization/build.sh
@@ -11,7 +11,8 @@ protoc \
   --plugin=../../node_modules/.bin/protoc-gen-ts_proto\
   --ts_proto_opt=esModuleInterop=true \
   --ts_proto_out=./ \
-  --ts_proto_opt=outputServices=generic-definitions,useExactTypes=false\
+  --ts_proto_opt=outputServices=generic-definitions,useExactTypes=false \
+  --ts_proto_opt=snakeToCamel=false \
   ./*.proto
 
 echo "Cleaning up folders"

diff --git a/modules/authorization/src/authorization.proto b/modules/authorization/src/authorization.proto
@@ -4,13 +4,13 @@ package authorization;
 
 message Resource {
   string name = 1;
-  repeated _Relation relations = 2;
-  repeated _Permission permissions = 3;
-  message _Relation {
+  repeated Relation relations = 2;
+  repeated Permission permissions = 3;
+  message Relation {
     string name = 1;
     repeated string resourceType = 2;
   }
-  message _Permission {
+  message Permission {
     string name = 1;
     repeated string roles = 2;
   }

diff --git a/modules/chat/build.sh b/modules/chat/build.sh
@@ -10,7 +10,8 @@ protoc \
   --plugin=../../node_modules/.bin/protoc-gen-ts_proto\
   --ts_proto_opt=esModuleInterop=true \
   --ts_proto_out=./ \
-  --ts_proto_opt=outputServices=generic-definitions,useExactTypes=false\
+  --ts_proto_opt=outputServices=generic-definitions,useExactTypes=false \
+  --ts_proto_opt=snakeToCamel=false \
   ./*.proto
 
 echo "Cleaning up folders"

diff --git a/modules/chat/src/Chat.ts b/modules/chat/src/Chat.ts
@@ -151,7 +151,7 @@ export default class Chat extends ManagedModule<Config> {
       }),
     );
     callback(null, {
-      Id: room._id,
+      _id: room._id,
       name: room.name,
       participants: room.participants as string[],
     });
@@ -203,13 +203,11 @@ export default class Chat extends ManagedModule<Config> {
   }
 
   async deleteRoom(call: GrpcRequest<DeleteRoomRequest>, callback: GrpcCallback<Room>) {
-    const { id } = call.request;
+    const { _id } = call.request;
 
     let errorMessage: string | null = null;
     const room: models.ChatRoom = await models.ChatRoom.getInstance()
-      .deleteOne({
-        _id: id,
-      })
+      .deleteOne({ _id })
       .catch((e: Error) => {
         errorMessage = e.message;
       });
@@ -219,7 +217,7 @@ export default class Chat extends ManagedModule<Config> {
 
     models.ChatMessage.getInstance()
       .deleteMany({
-        room: id,
+        room: _id,
       })
       .catch((e: Error) => {
         errorMessage = e.message;
@@ -237,7 +235,7 @@ export default class Chat extends ManagedModule<Config> {
       }),
     );
     callback(null, {
-      Id: room._id,
+      _id: room._id,
       name: room.name,
       participants: room.participants as string[],
     });

diff --git a/modules/chat/src/chat.proto b/modules/chat/src/chat.proto
@@ -14,7 +14,7 @@ message SendMessageRequest {
 }
 
 message DeleteRoomRequest {
-  string id = 1;
+  string _id = 1;
 }
 
 message Room {

diff --git a/modules/database/build.sh b/modules/database/build.sh
@@ -11,7 +11,8 @@ protoc \
   --plugin=../../node_modules/.bin/protoc-gen-ts_proto\
   --ts_proto_opt=esModuleInterop=true \
   --ts_proto_out=./ \
-  --ts_proto_opt=outputServices=generic-definitions,useExactTypes=false\
+  --ts_proto_opt=outputServices=generic-definitions,useExactTypes=false \
+  --ts_proto_opt=snakeToCamel=false \
   ./*.proto
 
 echo "Cleaning up folders"

diff --git a/modules/email/build.sh b/modules/email/build.sh
@@ -11,7 +11,8 @@ protoc \
   --plugin=../../node_modules/.bin/protoc-gen-ts_proto\
   --ts_proto_opt=esModuleInterop=true \
   --ts_proto_out=./ \
-  --ts_proto_opt=outputServices=generic-definitions,useExactTypes=false\
+  --ts_proto_opt=outputServices=generic-definitions,useExactTypes=false \
+  --ts_proto_opt=snakeToCamel=false \
   ./*.proto
 
 echo "Cleaning up folders"

diff --git a/modules/functions/build.sh b/modules/functions/build.sh
@@ -11,7 +11,8 @@ protoc \
   --plugin=../../node_modules/.bin/protoc-gen-ts_proto\
   --ts_proto_opt=esModuleInterop=true \
   --ts_proto_out=./ \
-  --ts_proto_opt=outputServices=generic-definitions,useExactTypes=false\
+  --ts_proto_opt=outputServices=generic-definitions,useExactTypes=false \
+  --ts_proto_opt=snakeToCamel=false \
   ./*.proto
 
 echo "Cleaning up folders"

diff --git a/modules/push-notifications/build.sh b/modules/push-notifications/build.sh
@@ -11,7 +11,8 @@ protoc \
   --plugin=../../node_modules/.bin/protoc-gen-ts_proto\
   --ts_proto_opt=esModuleInterop=true \
   --ts_proto_out=./ \
-  --ts_proto_opt=outputServices=generic-definitions,useExactTypes=false\
+  --ts_proto_opt=outputServices=generic-definitions,useExactTypes=false \
+  --ts_proto_opt=snakeToCamel=false \
   ./*.proto
 
 echo "Cleaning up folders"

diff --git a/modules/router/build.sh b/modules/router/build.sh
@@ -11,7 +11,8 @@ protoc \
   --plugin=../../node_modules/.bin/protoc-gen-ts_proto\
   --ts_proto_opt=esModuleInterop=true \
   --ts_proto_out=./ \
-  --ts_proto_opt=outputServices=generic-definitions,useExactTypes=false\
+  --ts_proto_opt=outputServices=generic-definitions,useExactTypes=false \
+  --ts_proto_opt=snakeToCamel=false \
   ./*.proto
 
 echo "Cleaning up folders"

diff --git a/modules/sms/build.sh b/modules/sms/build.sh
@@ -11,7 +11,8 @@ protoc \
   --plugin=../../node_modules/.bin/protoc-gen-ts_proto\
   --ts_proto_opt=esModuleInterop=true \
   --ts_proto_out=./ \
-  --ts_proto_opt=outputServices=generic-definitions,useExactTypes=false\
+  --ts_proto_opt=outputServices=generic-definitions,useExactTypes=false \
+  --ts_proto_opt=snakeToCamel=false \
   ./*.proto
 
 echo "Cleaning up folders"

diff --git a/modules/storage/build.sh b/modules/storage/build.sh
@@ -11,7 +11,8 @@ protoc \
   --plugin=../../node_modules/.bin/protoc-gen-ts_proto\
   --ts_proto_opt=esModuleInterop=true \
   --ts_proto_out=./ \
-  --ts_proto_opt=outputServices=generic-definitions,useExactTypes=false\
+  --ts_proto_opt=outputServices=generic-definitions,useExactTypes=false \
+  --ts_proto_opt=snakeToCamel=false \
   ./*.proto
 
 echo "Cleaning up folders"

diff --git a/packages/commons/build.sh b/packages/commons/build.sh
@@ -10,7 +10,8 @@ protoc \
   --plugin=../../node_modules/.bin/protoc-gen-ts_proto\
   --ts_proto_opt=esModuleInterop=true \
   --ts_proto_out=./ \
-  --ts_proto_opt=outputServices=generic-definitions,useExactTypes=false\
+  --ts_proto_opt=outputServices=generic-definitions,useExactTypes=false \
+  --ts_proto_opt=snakeToCamel=false \
   ./*.proto
 
 echo "Cleaning up folders"