fix tmpl

assets/templates/transport/grpc_server.tmpl

@@ -35,24 +35,24 @@ func RegisterServer(grpcSrv *grpc.Server, srv *Server) {
         {{- $response = (print "*emptypb.Empty") -}}
   {{- end -}}
 
-  // {{$method.Name}} implements {{$.Interface.Name}}
-  func (s *Server) {{$method.Name}}(ctx context.Context, request *pb.{{$method.Name}}Request) (response {{ $response }}, err error) {
-    req := {{$method.Name}}RequestFromPB(request)
   {{- $paramList := list -}}
     {{- range $param := $method.Params -}}
         {{- if not ( and $method.AcceptsContext (eq $param.Name "ctx")) -}}
             {{- $paramList = append $paramList (printf "req.%s" $param.Name ) -}}
         {{- end -}}
-    {{- end }}
+  {{- end -}}
 
-    {{ if gt $resListLen 0 }}
-        {{- $method.ResultsNames | join `,` -}} := s.service.{{- $method.Name -}}(ctx, {{- $paramList | join `, ` -}})
+
+// {{$method.Name}} implements {{$.Interface.Name}}
+  func (s *Server) {{$method.Name}}(ctx context.Context, request *pb.{{$method.Name}}Request) (response {{ $response }}, err error) {
+    req := {{$method.Name}}RequestFromPB(request)
+    {{- if gt $resListLen 0 }}
+        {{ $method.ResultsNames | join `,` }} := s.service.{{ $method.Name }}(ctx, {{ $paramList | join `, ` }})
     {{- else }}
-        err = s.service.{{- $method.Name -}}(ctx, {{- $paramList | join `, ` -}})
+        err = s.service.{{ $method.Name }}(ctx, {{ $paramList | join `, ` }})
     {{- end }}
-
-    {{ if gt $resListLen 0 -}}
-        response = {{- $method.Name -}}ResponseToPB({{- $resList | join `,` -}})
+    {{- if gt $resListLen 0 }}
+        response = {{ $method.Name }}ResponseToPB({{ $resList | join `,` }})
     {{- end }}
     return
   }

pkg/invitations/server.go

@@ -30,18 +30,14 @@ func RegisterServer(grpcSrv *grpc.Server, srv *Server) {
 // Accept implements Invitations
 func (s *Server) Accept(ctx context.Context, request *pb.AcceptRequest) (response *emptypb.Empty, err error) {
 	req := AcceptRequestFromPB(request)
-
 	err = s.service.Accept(ctx, req.invitationId, req.userId)
-
 	return
 }
 
 // Create implements Invitations
 func (s *Server) Create(ctx context.Context, request *pb.CreateRequest) (response *pb.CreateResponse, err error) {
 	req := CreateRequestFromPB(request)
-
 	created, err := s.service.Create(ctx, req.invitation)
-
 	response = CreateResponseToPB(created)
 	return
 }
@@ -49,18 +45,14 @@ func (s *Server) Create(ctx context.Context, request *pb.CreateRequest) (respons
 // Delete implements Invitations
 func (s *Server) Delete(ctx context.Context, request *pb.DeleteRequest) (response *emptypb.Empty, err error) {
 	req := DeleteRequestFromPB(request)
-
 	err = s.service.Delete(ctx, req.invitationId)
-
 	return
 }
 
 // Find implements Invitations
 func (s *Server) Find(ctx context.Context, request *pb.FindRequest) (response *pb.FindResponse, err error) {
 	req := FindRequestFromPB(request)
-
 	invitations, total, err := s.service.Find(ctx, req.filter, req.opts)
-
 	response = FindResponseToPB(invitations, total)
 	return
 }
@@ -68,9 +60,7 @@ func (s *Server) Find(ctx context.Context, request *pb.FindRequest) (response *p
 // Get implements Invitations
 func (s *Server) Get(ctx context.Context, request *pb.GetRequest) (response *pb.GetResponse, err error) {
 	req := GetRequestFromPB(request)
-
 	invitation, err := s.service.Get(ctx, req.invitationId)
-
 	response = GetResponseToPB(invitation)
 	return
 }