fix: added new path

mahendraintelops · mahendraintelops · commit 64c0bd4a61a5 · 2024-04-03T13:51:02.000+05:30
diff --git a/internal/integrations/deepsource/copier.go b/internal/integrations/deepsource/copier.go
@@ -26,7 +26,7 @@ func NewCopier(project *core.Project) (*Copier, error) {
 		"GitPlatformUserName": project.GitPlatformUserName,
 	}
 
-	templatesRootPath, err := utils.GetTemplatesRootPath("common-templates/code", project.Version)
+	templatesRootPath, err := utils.GetTemplatesRootPath("common-templates", project.Version)
 	if err != nil {
 		log.Errorf("error while getting the project root path [" + err.Error() + "]")
 		return nil, err
diff --git a/internal/integrations/license/copier.go b/internal/integrations/license/copier.go
@@ -26,7 +26,7 @@ func NewCopier(project *core.Project) (*Copier, error) {
 		"GitPlatformUserName": project.GitPlatformUserName,
 	}
 
-	templatesRootPath, err := utils.GetTemplatesRootPath("common-templates/code", project.Version)
+	templatesRootPath, err := utils.GetTemplatesRootPath("common-templates", project.Version)
 	if err != nil {
 		log.Errorf("error while getting the project root path [" + err.Error() + "]")
 		return nil, err
diff --git a/internal/integrations/readme/copier.go b/internal/integrations/readme/copier.go
@@ -26,7 +26,7 @@ func NewCopier(project *core.Project) (*Copier, error) {
 		"GitPlatformUserName": project.GitPlatformUserName,
 	}
 
-	templatesRootPath, err := utils.GetTemplatesRootPath("common-templates/code", project.Version)
+	templatesRootPath, err := utils.GetTemplatesRootPath("common-templates", project.Version)
 	if err != nil {
 		log.Errorf("error while getting the project root path [" + err.Error() + "]")
 		return nil, err
diff --git a/internal/languages/golang/models.go b/internal/languages/golang/models.go
@@ -7,7 +7,7 @@ import (
 )
 
 // TemplateDirectoryName directory of template files
-const TemplateDirectoryName = "compage-template-go/code"
+const TemplateDirectoryName = "compage-template-go"
 const GoGinServerFramework = "go-gin-server"
 const GoGrpcServerFramework = "go-grpc-server"
 const CommonFiles = "common-files"
diff --git a/internal/languages/java/models.go b/internal/languages/java/models.go
@@ -7,7 +7,7 @@ import (
 )
 
 // TemplateDirectoryName directory of template files
-const TemplateDirectoryName = "compage-template-java/code"
+const TemplateDirectoryName = "compage-template-java"
 
 var LJavaPlayFramework = "java-play-framework"
 var LJavaMicronautServer = "java-micronaut-server"
diff --git a/internal/languages/javascript/models.go b/internal/languages/javascript/models.go
@@ -7,7 +7,7 @@ import (
 )
 
 // TemplateDirectoryName directory of template files
-const TemplateDirectoryName = "compage-template-javascript/code"
+const TemplateDirectoryName = "compage-template-javascript"
 
 // LJavaScriptNode language specific struct.
 type LJavaScriptNode struct {
diff --git a/internal/languages/python/models.go b/internal/languages/python/models.go
@@ -7,7 +7,7 @@ import (
 )
 
 // TemplateDirectoryName directory of template files
-const TemplateDirectoryName = "compage-template-python/code"
+const TemplateDirectoryName = "compage-template-python"
 
 // LPythonNode language specific struct.
 type LPythonNode struct {
diff --git a/internal/languages/ruby/models.go b/internal/languages/ruby/models.go
@@ -7,7 +7,7 @@ import (
 )
 
 // TemplateDirectoryName directory of template files
-const TemplateDirectoryName = "compage-template-ruby/code"
+const TemplateDirectoryName = "compage-template-ruby"
 
 // LRubyNode language specific struct.
 type LRubyNode struct {
diff --git a/internal/languages/rust/models.go b/internal/languages/rust/models.go
@@ -7,7 +7,7 @@ import (
 )
 
 // TemplateDirectoryName directory of template files
-const TemplateDirectoryName = "compage-template-rust/code"
+const TemplateDirectoryName = "compage-template-rust"
 
 // LRustNode language specific struct.
 type LRustNode struct {
diff --git a/internal/languages/typescript/models.go b/internal/languages/typescript/models.go
@@ -7,7 +7,7 @@ import (
 )
 
 // TemplateDirectoryName directory of template files
-const TemplateDirectoryName = "compage-template-typescript/code"
+const TemplateDirectoryName = "compage-template-typescript"
 
 // LTypeScriptNode language specific struct.
 type LTypeScriptNode struct {
diff --git a/internal/utils/templatePathUtils.go b/internal/utils/templatePathUtils.go
@@ -22,5 +22,5 @@ func GetTemplatesRootPath(languageTemplateDirectoryName, version string) (string
 		log.Errorf("error while getting the base template root path [" + err.Error() + "]")
 		return "", err
 	}
-	return baseTemplateRootPath + "/" + languageTemplateDirectoryName + "/" + version, nil
+	return baseTemplateRootPath + "/" + languageTemplateDirectoryName + "/" + version + "/code", nil
 }
diff --git a/test/generator_test.go b/test/generator_test.go
@@ -69,6 +69,7 @@ func TestRestServerGeneratorNoSql(t *testing.T) {
 		GitRepositoryName:   "first-rest-server-project-nosql",
 		ProjectName:         "first-rest-server-project-nosql",
 		ProjectJSON:         restServerConfigJSON,
+		ProjectVersion:      "v1.0.0",
 	}
 	defer func() {
 		_ = os.RemoveAll(utils.GetProjectDirectoryName("first-rest-server-project-nosql"))
@@ -144,6 +145,7 @@ func TestRestServerGeneratorSqlMap(t *testing.T) {
 		GitRepositoryName:   "first-rest-server-project-map",
 		ProjectName:         "first-rest-server-project-map",
 		ProjectJSON:         restServerConfigJSON,
+		ProjectVersion:      "v1.0.0",
 	}
 	defer func() {
 		_ = os.RemoveAll(utils.GetProjectDirectoryName("first-rest-server-project-map"))
@@ -223,6 +225,7 @@ func TestRestServerGeneratorSqlSQLite(t *testing.T) {
 		GitRepositoryName:   "first-rest-server-project-sqlite",
 		ProjectName:         "first-rest-server-project-sqlite",
 		ProjectJSON:         restServerConfigJSON,
+		ProjectVersion:      "v1.0.0",
 	}
 	defer func() {
 		_ = os.RemoveAll(utils.GetProjectDirectoryName("first-rest-server-project-sqlite"))
@@ -298,6 +301,7 @@ func TestRestServerGeneratorSqlMySQL(t *testing.T) {
 		GitRepositoryName:   "first-rest-server-project-mysql",
 		ProjectName:         "first-rest-server-project-mysql",
 		ProjectJSON:         restServerConfigJSON,
+		ProjectVersion:      "v1.0.0",
 	}
 	defer func() {
 		_ = os.RemoveAll(utils.GetProjectDirectoryName("first-rest-server-project-mysql"))
@@ -373,6 +377,7 @@ func TestRestServerGeneratorSqlSQLiteGORM(t *testing.T) {
 		GitRepositoryName:   "first-rest-server-project-sqlite-gorm",
 		ProjectName:         "first-rest-server-project-sqlite-gorm",
 		ProjectJSON:         restServerConfigJSON,
+		ProjectVersion:      "v1.0.0",
 	}
 	defer func() {
 		_ = os.RemoveAll(utils.GetProjectDirectoryName("first-rest-server-project-sqlite-gorm"))
@@ -448,6 +453,7 @@ func TestRestServerGeneratorSqlMySQLGORM(t *testing.T) {
 		GitRepositoryName:   "first-rest-server-project-mysql-gorm",
 		ProjectName:         "first-rest-server-project-mysql-gorm",
 		ProjectJSON:         restServerConfigJSON,
+		ProjectVersion:      "v1.0.0",
 	}
 	defer func() {
 		_ = os.RemoveAll(utils.GetProjectDirectoryName("first-rest-server-project-mysql-gorm"))
@@ -513,6 +519,7 @@ func TestRestServerWithOpenApiGenerator(t *testing.T) {
 				GitRepositoryName:   "first-project-github",
 				ProjectName:         "first-openapi-based-project-" + tt.language,
 				ProjectJSON:         replacedConfig,
+				ProjectVersion:      "v1.0.0",
 			}
 			defer func() {
 				_ = os.RemoveAll(utils.GetProjectDirectoryName("first-openapi-based-project-" + tt.language))
@@ -586,6 +593,7 @@ func TestGrpcServerGeneratorNoSql(t *testing.T) {
 		GitRepositoryName:   "first-grpc-server-project-nosql",
 		ProjectName:         "first-grpc-server-project-nosql",
 		ProjectJSON:         grpcServerConfigJSON,
+		ProjectVersion:      "v1.0.0",
 	}
 	defer func() {
 		_ = os.RemoveAll(utils.GetProjectDirectoryName("first-grpc-server-project-nosql"))
@@ -655,6 +663,7 @@ func TestGrpcServerGeneratorSqlMap(t *testing.T) {
 		GitRepositoryName:   "first-grpc-server-project-map",
 		ProjectName:         "first-grpc-server-project-map",
 		ProjectJSON:         grpcServerConfigJSON,
+		ProjectVersion:      "v1.0.0",
 	}
 	defer func() {
 		_ = os.RemoveAll(utils.GetProjectDirectoryName("first-grpc-server-project-map"))
@@ -728,6 +737,7 @@ func TestGrpcServerGeneratorSqlSQLite(t *testing.T) {
 		GitRepositoryName:   "first-grpc-server-project-sqlite",
 		ProjectName:         "first-grpc-server-project-sqlite",
 		ProjectJSON:         grpcServerConfigJSON,
+		ProjectVersion:      "v1.0.0",
 	}
 	defer func() {
 		_ = os.RemoveAll(utils.GetProjectDirectoryName("first-grpc-server-project-sqlite"))
@@ -797,6 +807,7 @@ func TestGrpcServerGeneratorSqlMySQL(t *testing.T) {
 		GitRepositoryName:   "first-grpc-server-project-mysql",
 		ProjectName:         "first-grpc-server-project-mysql",
 		ProjectJSON:         grpcServerConfigJSON,
+		ProjectVersion:      "v1.0.0",
 	}
 	defer func() {
 		_ = os.RemoveAll(utils.GetProjectDirectoryName("first-grpc-server-project-mysql"))
@@ -866,6 +877,7 @@ func TestGrpcServerGeneratorSqlSQLiteGORM(t *testing.T) {
 		GitRepositoryName:   "first-grpc-server-project-sqlite-gorm",
 		ProjectName:         "first-grpc-server-project-sqlite-gorm",
 		ProjectJSON:         grpcServerConfigJSON,
+		ProjectVersion:      "v1.0.0",
 	}
 	defer func() {
 		_ = os.RemoveAll(utils.GetProjectDirectoryName("first-grpc-server-project-sqlite-gorm"))
@@ -935,6 +947,7 @@ func TestGrpcServerGeneratorSqlMySQLGORM(t *testing.T) {
 		GitRepositoryName:   "first-grpc-server-project-mysql-gorm",
 		ProjectName:         "first-grpc-server-project-mysql-gorm",
 		ProjectJSON:         grpcServerConfigJSON,
+		ProjectVersion:      "v1.0.0",
 	}
 	defer func() {
 		_ = os.RemoveAll(utils.GetProjectDirectoryName("first-grpc-server-project-mysql-gorm"))
@@ -1109,6 +1122,7 @@ func TestRestServerClientsAndGrpcServerClientsCrossConfigGenerator(t *testing.T)
 		GitRepositoryName:   "first-rest-server-clients-and-grpc-server-clients-cross-config-project",
 		ProjectName:         "first-rest-server-clients-and-grpc-server-clients-cross-config-project",
 		ProjectJSON:         restGrpcServerClientsCrossConfigJSON,
+		ProjectVersion:      "v1.0.0",
 	}
 	defer func() {
 		_ = os.RemoveAll(utils.GetProjectDirectoryName("first-rest-server-clients-and-grpc-server-clients-cross-config-project"))
@@ -1218,6 +1232,7 @@ func TestRestClientAndGrpcClientCrossConfigGenerator(t *testing.T) {
 		GitRepositoryName:   "first-rest-client-and-grpc-client-cross-config-project",
 		ProjectName:         "first-rest-client-and-grpc-client-cross-config-project",
 		ProjectJSON:         restGrpcClientCrossConfigJSON,
+		ProjectVersion:      "v1.0.0",
 	}
 	defer func() {
 		_ = os.RemoveAll(utils.GetProjectDirectoryName("first-rest-client-and-grpc-client-cross-config-project"))
@@ -1293,6 +1308,7 @@ func TestRestAndGrpcServerGenerator(t *testing.T) {
 		GitRepositoryName:   "first-rest-and-grpc-server-project",
 		ProjectName:         "first-rest-and-grpc-server-project",
 		ProjectJSON:         restAndGrpcServerConfigJSON,
+		ProjectVersion:      "v1.0.0",
 	}
 	defer func() {
 		_ = os.RemoveAll(utils.GetProjectDirectoryName("first-rest-and-grpc-server-project"))
@@ -1350,6 +1366,7 @@ func TestWsServerGenerator(t *testing.T) {
 		GitRepositoryName:   "first-ws-server-project",
 		ProjectName:         "first-ws-server-project",
 		ProjectJSON:         wsServerConfigJSON,
+		ProjectVersion:      "v1.0.0",
 	}
 	defer func() {
 		_ = os.RemoveAll(utils.GetProjectDirectoryName("first-ws-server-project"))
@@ -1422,6 +1439,7 @@ func TestDotNetCleanArchitectureGenerator(t *testing.T) {
 		GitRepositoryName:   "first-rest-server-project-dotnet",
 		ProjectName:         "first-rest-server-project-dotnet",
 		ProjectJSON:         restServerConfigJSON,
+		ProjectVersion:      "v1.0.0",
 	}
 	defer func() {
 		_ = os.RemoveAll(utils.GetProjectDirectoryName("first-rest-server-project-dotnet"))

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func NewCopier(project core.Project) (Copier, error) {`
`26`	`26`	`"GitPlatformUserName": project.GitPlatformUserName,`
`27`	`27`	`}`
`28`	`28`
`29`		`- templatesRootPath, err := utils.GetTemplatesRootPath("common-templates/code", project.Version)`
	`29`	`+ templatesRootPath, err := utils.GetTemplatesRootPath("common-templates", project.Version)`
`30`	`30`	`if err != nil {`
`31`	`31`	`log.Errorf("error while getting the project root path [" + err.Error() + "]")`
`32`	`32`	`return nil, err`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`// TemplateDirectoryName directory of template files`
`10`		`-const TemplateDirectoryName = "compage-template-go/code"`
	`10`	`+const TemplateDirectoryName = "compage-template-go"`
`11`	`11`	`const GoGinServerFramework = "go-gin-server"`
`12`	`12`	`const GoGrpcServerFramework = "go-grpc-server"`
`13`	`13`	`const CommonFiles = "common-files"`