fix(codegen): lint issues

Author: matoous

codegen/pkg/generator/names.go

@@ -98,28 +98,3 @@ func phpEnumCaseName(value string) string {
 
 	return value
 }
-
-func isServiceLocalSchemaName(name string) bool {
-	name = strings.TrimSpace(name)
-	if name == "" {
-		return false
-	}
-
-	suffixes := []string{
-		"Request",
-		"RequestBody",
-		"Response",
-		"ResponseBody",
-		"Params",
-		"Param",
-		"Parameters",
-	}
-
-	for _, suffix := range suffixes {
-		if strings.HasSuffix(name, suffix) {
-			return true
-		}
-	}
-
-	return false
-}

codegen/pkg/generator/operations.go

@@ -191,7 +191,7 @@ func (g *Generator) buildOperation(method, path string, op *v3.Operation, params
 		BodySchema:   bodySchema,
 		BodyRequired: bodyRequired,
 		Deprecated:   deprecated,
-		Responses:    g.collectOperationResponses(op, operationID),
+		Responses:    g.collectOperationResponses(op, operationID, method, path),
 	}, nil
 }
 
@@ -200,10 +200,7 @@ func (g *Generator) resolveOperationBody(op *v3.Operation) (string, string, bool
 		return "", "", false, nil
 	}
 
-	required := false
-	if op.RequestBody.Required != nil && *op.RequestBody.Required {
-		required = true
-	}
+	required := op.RequestBody.Required != nil && *op.RequestBody.Required
 
 	var schema *base.SchemaProxy
 	if op.RequestBody.Content != nil {
@@ -247,15 +244,15 @@ func (op *operation) methodName() string {
 	return strcase.ToLowerCamel(op.ID)
 }
 
-func (g *Generator) collectOperationResponses(op *v3.Operation, operationID string) []*operationResponse {
+func (g *Generator) collectOperationResponses(op *v3.Operation, operationID string, method string, path string) []*operationResponse {
 	if op == nil || op.Responses == nil || op.Responses.Codes.Len() == 0 {
 		return nil
 	}
 
 	responses := make([]*operationResponse, 0, op.Responses.Codes.Len())
 
 	for status, response := range op.Responses.Codes.FromOldest() {
-		respType := g.responseTypeForResponse(response, "SumUp\\Services", operationID, status)
+		respType := g.responseTypeForResponse(response, "SumUp\\Services", operationID, status, method, path)
 		if respType == nil {
 			continue
 		}
@@ -275,7 +272,7 @@ func (g *Generator) collectOperationResponses(op *v3.Operation, operationID stri
 	return responses
 }
 
-func (g *Generator) responseTypeForResponse(resp *v3.Response, currentNamespace string, operationID string, statusCode string) *responseType {
+func (g *Generator) responseTypeForResponse(resp *v3.Response, currentNamespace string, operationID string, statusCode string, method string, path string) *responseType {
 	if resp == nil {
 		return &responseType{Kind: responseTypeVoid}
 	}
@@ -307,7 +304,7 @@ func (g *Generator) responseTypeForResponse(resp *v3.Response, currentNamespace
 		return &responseType{Kind: responseTypeVoid}
 	}
 
-	return g.buildResponseType(schema, currentNamespace, inlineResponseClassName(operationID, statusCode))
+	return g.buildResponseType(schema, currentNamespace, inlineResponseClassName(operationID, statusCode, method, path))
 }
 
 func (g *Generator) buildResponseType(schema *base.SchemaProxy, currentNamespace string, inlineBaseName string) *responseType {
@@ -407,12 +404,30 @@ func (g *Generator) buildResponseTypeFromSpec(spec *base.Schema, currentNamespac
 	return &responseType{Kind: responseTypeMixed}
 }
 
-func inlineResponseClassName(operationID string, statusCode string) string {
+func inlineResponseClassName(operationID string, statusCode string, method string, path string) string {
 	if operationID == "" {
 		return ""
 	}
 
-	base := strcase.ToCamel(operationID) + "Response"
+	pathPart := ""
+	if path != "" {
+		replacer := strings.NewReplacer("/", "_", "{", "", "}", "", "-", "_", ".", "_")
+		pathPart = strcase.ToCamel(replacer.Replace(strings.Trim(path, "/")))
+	}
+
+	methodPart := ""
+	if method != "" {
+		methodPart = strcase.ToCamel(strings.ToLower(method))
+	}
+
+	base := strcase.ToCamel(operationID)
+	if pathPart != "" {
+		base += pathPart
+	}
+	if methodPart != "" {
+		base += methodPart
+	}
+	base += "Response"
 	if statusCode != "" && statusCode != "200" {
 		base += statusCode
 	}