Fixes

flipp-oss · Apr 4, 2024 · 73d5737 · 73d5737
1 parent 53a0756
commit 73d5737
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/lib/grpc_rest.rb b/lib/grpc_rest.rb
@@ -56,11 +56,6 @@ def assign_params(request, param_hash, body_string, params)
           sub_record.public_send(:"#{key}=", parameters.delete(key))
         end
       end
-
-      # assign remaining parameters
-      parameters.each do |k, v|
-        assign_value(request, k, v)
-      end
     end
 
     def error_msg(error)

diff --git a/protoc-gen-rails/internal/output.go b/protoc-gen-rails/internal/output.go
@@ -16,7 +16,6 @@ type FileResult struct {
 
 type controller struct {
 	ControllerName string
-	ServiceFilePath string
 	Methods []method
 	ServiceName string
 	FullServiceName string
@@ -41,7 +40,6 @@ type Route struct {
 
 var controllerTemplate = `
 require 'grpc_rest'
-require 'services/geo_admin/v1/test_services_pb'
 class {{.ControllerName}}Controller < ActionController::Base
   protect_from_forgery with: :null_session
 
@@ -60,8 +58,9 @@ class {{.ControllerName}}Controller < ActionController::Base
 {{$fullServiceName := .FullServiceName -}}
 {{range .Methods }}
 	def {{.Name}}
-	  grpc_request = {{.RequestType}}.new
-	  GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["{{.Name}}"], "{{.Body}}", request.parameters)
+    fields = {{.RequestType}}.descriptor.to_a.map(&:name)
+    grpc_request = {{.RequestType}}.new(request.parameters.to_h.slice(*fields))
+    GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["{{.Name}}"], "{{.Body}}", request.parameters)
     render json: GrpcRest.send_request("{{$fullServiceName}}", "{{.Name}}", grpc_request)
   end
 {{end}}
@@ -74,7 +73,6 @@ func ProcessService(service *descriptorpb.ServiceDescriptorProto, pkg string) (F
 		Methods: []method{},
 		ServiceName: Classify(service.GetName()),
 		ControllerName: Demodulize(service.GetName()),
-		ServiceFilePath: FilePathify(pkg + "." + service.GetName()),
 		FullServiceName: Classify(pkg + "." + service.GetName()),
 	}
 	for _, m := range service.GetMethod() {

diff --git a/protoc-gen-rails/testdata/base/app/controllers/my_service_controller.rb b/protoc-gen-rails/testdata/base/app/controllers/my_service_controller.rb
@@ -1,6 +1,5 @@
 
 require 'grpc_rest'
-require 'services/geo_admin/v1/test_services_pb'
 class MyServiceController < ActionController::Base
   protect_from_forgery with: :null_session
 
@@ -23,20 +22,23 @@ class MyServiceController < ActionController::Base
 }.freeze
 
 	def test
-	  grpc_request = Testdata::TestRequest.new
-	  GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["test"], "*", request.parameters)
+    fields = Testdata::TestRequest.descriptor.to_a.map(&:name)
+    grpc_request = Testdata::TestRequest.new(request.parameters.to_h.slice(*fields))
+    GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["test"], "*", request.parameters)
     render json: GrpcRest.send_request("Testdata::MyService", "test", grpc_request)
   end
 
 	def test_2
-	  grpc_request = Testdata::TestRequest.new
-	  GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["test_2"], "second_record", request.parameters)
+    fields = Testdata::TestRequest.descriptor.to_a.map(&:name)
+    grpc_request = Testdata::TestRequest.new(request.parameters.to_h.slice(*fields))
+    GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["test_2"], "second_record", request.parameters)
     render json: GrpcRest.send_request("Testdata::MyService", "test_2", grpc_request)
   end
 
 	def test_3
-	  grpc_request = Testdata::TestRequest.new
-	  GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["test_3"], "", request.parameters)
+    fields = Testdata::TestRequest.descriptor.to_a.map(&:name)
+    grpc_request = Testdata::TestRequest.new(request.parameters.to_h.slice(*fields))
+    GrpcRest.assign_params(grpc_request, METHOD_PARAM_MAP["test_3"], "", request.parameters)
     render json: GrpcRest.send_request("Testdata::MyService", "test_3", grpc_request)
   end