chore(golang): dto.name should always be used even if another struct can be used instead

Part of #9

Author: php-coder

examples/go/routes.go

@@ -27,6 +27,13 @@ type CreateCategoryDto struct {
 	UserId *string `json:"user_id,omitempty" db:"user_id"`
 }
 
+type CategoryInfoDto struct {
+	Id     *string `json:"id,omitempty" db:"id"`
+	Name   *string `json:"name,omitempty" db:"name"`
+	NameRu *string `json:"name_ru,omitempty" db:"name_ru"`
+	Slug   *string `json:"slug,omitempty" db:"slug"`
+}
+
 func registerRoutes(r chi.Router, db *sqlx.DB) {
 	categories := make(map[int]CategoryDto)
 	cnt := 0
@@ -104,7 +111,7 @@ func registerRoutes(r chi.Router, db *sqlx.DB) {
 			return
 		}
 
-		var result CategoryDto
+		var result CategoryInfoDto
 		args := map[string]interface{}{
 			"categoryId": chi.URLParam(r, "categoryId"),
 		}

examples/js/endpoints.yaml

@@ -56,6 +56,8 @@
            , slug
         FROM categories
        WHERE id = :p.categoryId
+    dto:
+      name: CategoryInfoDto
   put:
     query: >-
       UPDATE categories

src/templates/routes.go.ejs

@@ -95,6 +95,7 @@ function query2dto(parser, method) {
 	const name = hasName ? method.dto.name : "Dto" + ++globalDtoCounter;
 	return {
 		"name": name,
+		"hasUserProvidedName": hasName,
 		"props": propsWithTypes,
 		// max length is needed for proper formatting
 		"maxFieldNameLength": lengthOfLongestString(props),
@@ -146,6 +147,10 @@ function cacheDto(dto) {
 	return dto;
 }
 function dtoInCache(dto) {
+	// always prefer user specified name even when we have a similar DTO in cache
+	if (dto.hasUserProvidedName) {
+		return false;
+	}
 	return dtoCache.hasOwnProperty(dto.signature);
 }
 
@@ -178,7 +183,8 @@ endpoints.forEach(function(endpoint) {
 			const dto = query2dto(sqlParser, method);
 			// TODO: do we really need signature and cache?
 			const cacheKey = dto ? dto.signature : null;
-			const dataType = hasGetMany ? '[]' + dtoCache[cacheKey] : dtoCache[cacheKey];
+			const dtoName = dtoInCache(dto) ? dtoCache[cacheKey] : dto.name;
+			const dataType = hasGetMany ? '[]' + dtoName : dtoName;
 
 			const params = extractParams(method.query);
 			const formattedParams = formatParamsAsGolangVararg(params);