enhancement: added customized useful-commands file and fixed issue in api.proto

Author: mahendraintelops

core/internal/languages/golang/frameworks/common-files/copier.go

@@ -1,9 +1,11 @@
 package commonfiles
 
 import (
+	"fmt"
 	"github.com/gertd/go-pluralize"
 	corenode "github.com/intelops/compage/core/internal/core/node"
 	"github.com/intelops/compage/core/internal/languages/executor"
+	commonUtils "github.com/intelops/compage/core/internal/languages/utils"
 	"github.com/intelops/compage/core/internal/utils"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
@@ -35,7 +37,16 @@ type Copier struct {
 	PluralizeClient   *pluralize.Client
 }
 
-type resourceData struct {
+type restResourceData struct {
+	SmallResourceNameSingular string
+	SmallResourceNamePlural   string
+	CapsResourceNameSingular  string
+	CapsResourceNamePlural    string
+	ResourcePostBody          string
+	ResourcePutBody           string
+}
+
+type grpcResourceData struct {
 	SmallResourceNameSingular string
 	SmallResourceNamePlural   string
 	CapsResourceNameSingular  string
@@ -57,9 +68,9 @@ func NewCopier(userName, repositoryName, nodeName, nodeDirectoryName, templatesR
 		"UserName":       userName,
 	}
 	// set all grpcResources for main.go.tmpl
-	var grpcResourcesData []resourceData
+	var grpcResourcesData []grpcResourceData
 	for _, r := range grpcResources {
-		grpcResourcesData = append(grpcResourcesData, resourceData{
+		grpcResourcesData = append(grpcResourcesData, grpcResourceData{
 			SmallResourceNameSingular: strings.ToLower(r.Name),
 			SmallResourceNamePlural:   pluralizeClient.Plural(strings.ToLower(r.Name)),
 			CapsResourceNameSingular:  r.Name,
@@ -74,13 +85,15 @@ func NewCopier(userName, repositoryName, nodeName, nodeDirectoryName, templatesR
 	data["HasGrpcClients"] = HasGrpcClients
 
 	// set all grpcResources for main.go.tmpl
-	var restResourcesData []resourceData
+	var restResourcesData []restResourceData
 	for _, r := range restResources {
-		restResourcesData = append(restResourcesData, resourceData{
+		restResourcesData = append(restResourcesData, restResourceData{
 			SmallResourceNameSingular: strings.ToLower(r.Name),
 			SmallResourceNamePlural:   pluralizeClient.Plural(strings.ToLower(r.Name)),
 			CapsResourceNameSingular:  r.Name,
 			CapsResourceNamePlural:    pluralizeClient.Plural(r.Name),
+			ResourcePostBody:          getResourcePostBody(r),
+			ResourcePutBody:           getResourcePutBody(r),
 		})
 	}
 	data["RestResources"] = restResourcesData
@@ -93,7 +106,7 @@ func NewCopier(userName, repositoryName, nodeName, nodeDirectoryName, templatesR
 	if hasRestClients {
 		var d []clientData
 		for _, restClient := range restClients {
-			d = append(d, clientData{SourceNodeID: strings.Replace(cases.Title(language.Und, cases.NoLower).String(restClient.SourceNodeID), "-", "_", -1)})
+			d = append(d, clientData{SourceNodeID: strings.Replace(cases.Title(language.Und, cases.NoLower).String(restClient.SourceNodeID), "-", "", -1)})
 		}
 		data["RestClients"] = d
 	}
@@ -125,6 +138,28 @@ func NewCopier(userName, repositoryName, nodeName, nodeDirectoryName, templatesR
 	}
 }
 
+func getResourcePostBody(r *corenode.Resource) string {
+	postBody := "{"
+	for key, value := range r.Fields {
+		sprintf := fmt.Sprintf("\"%s\": \"%v\",", key, commonUtils.GetDefaultValueForDataType(value))
+		postBody += sprintf
+	}
+	postBody = strings.TrimSuffix(postBody, ",")
+	postBody += "}"
+	return postBody
+}
+
+func getResourcePutBody(r *corenode.Resource) string {
+	putBody := fmt.Sprintf("{\"%s\": %v,", "Id", 123)
+	for key, value := range r.Fields {
+		sprintf := fmt.Sprintf("\"%s\": \"%v\",", key, commonUtils.GetDefaultValueForDataType(value))
+		putBody += sprintf
+	}
+	putBody = strings.TrimSuffix(putBody, ",")
+	putBody += "}"
+	return putBody
+}
+
 // CreateCommonFiles creates/copies relevant files to generated project
 func (c Copier) CreateCommonFiles() error {
 	var filePaths []string

core/internal/languages/golang/frameworks/go-gin-server/copier.go

@@ -246,7 +246,7 @@ func (c Copier) copyRestClientResourceFiles(restClient *corenode.RestClient) err
 	/// add resource specific data to map in c needed for templates.
 	c.Data["RestClientPort"] = restClient.Port
 	c.Data["RestClientServiceName"] = restClient.SourceNodeName
-	c.Data["RestClientSourceNodeID"] = strings.Replace(cases.Title(language.Und, cases.NoLower).String(restClient.SourceNodeID), "-", "_", -1)
+	c.Data["RestClientSourceNodeID"] = strings.Replace(cases.Title(language.Und, cases.NoLower).String(restClient.SourceNodeID), "-", "", -1)
 
 	// copy restClient files to generated project.
 	targetResourceClientFileName := c.NodeDirectoryName + RestClientPath + "/" + restClient.SourceNodeName + "-" + ClientFile

core/internal/languages/golang/frameworks/go-grpc-server/copier.go

@@ -288,14 +288,17 @@ func (c Copier) CopyGrpcClientResourceFiles(grpcClient *corenode.GrpcClient) err
 func (c Copier) addResourceSpecificTemplateData(resource *corenode.Resource) error {
 	// make every field public by making its first character capital.
 	fields := map[string]string{}
+	protoFields := map[string]string{}
 	// this slice is needed for grpc resource message generation
 	var fieldNames []string
 	for key, value := range resource.Fields {
 		key = cases.Title(language.Und, cases.NoLower).String(key)
-		fields[key] = commonUtils.GetProtoBufDataType(value)
+		fields[key] = value
+		protoFields[key] = commonUtils.GetProtoBufDataType(value)
 		fieldNames = append(fieldNames, key)
 	}
 	c.Data["Fields"] = fields
+	c.Data["ProtoFields"] = protoFields
 	c.Data["FieldNames"] = fieldNames
 	// db fields
 	if c.IsSQLDB {

core/internal/languages/utils/common.go

@@ -130,3 +130,46 @@ func GetMySQLDataType(value string) string {
 		return "VARCHAR(100)"
 	}
 }
+
+func GetDefaultValueForDataType(value string) interface{} {
+	switch value {
+	case "int":
+		fallthrough
+	case "int16":
+		fallthrough
+	case "int32":
+		fallthrough
+	case "int64":
+		fallthrough
+	case "uint8":
+		fallthrough
+	case "uint16":
+		fallthrough
+	case "uint32":
+		fallthrough
+	case "uint64":
+		fallthrough
+	case "uint":
+		fallthrough
+	case "rune":
+		fallthrough
+	case "byte":
+		fallthrough
+	case "uintptr":
+		return 1
+	case "bool":
+		return true
+	case "float32":
+		fallthrough
+	case "float64":
+		return 1.0
+	case "complex64":
+		fallthrough
+	case "complex128":
+		return 1.0
+	case "string":
+		return "sample string"
+	default:
+		return "defaultValue"
+	}
+}

core/templates/compage-template-go

@@ -381,7 +381,9 @@ func TestRestServerGenerator(t *testing.T) {
                         "resources": [
                             {
                                 "fields": {
-                                    "Name": "string"
+                                    "Name": "string",
+                                    "Address": "string",
+                                    "Age": "int32"
                                 },
                                 "name": "User"
                             }