Fix models name and docs.go

.vscode/launch.json

@@ -49,7 +49,7 @@
                 "--outdir-backend",
                 "../zmap/backend",
                 "--outdir-frontend",
-                "dist/frontend"
+                "../zmap/frontend"
             ]
         }
     ]

lib/backend-fixapi.go

@@ -0,0 +1,25 @@
+package lib
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"regexp"
+)
+
+func backendFixApi() {
+	buff, err := os.ReadFile(fmt.Sprintf("%s/docs/docs.go", AppConfig.OutdirBackend))
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	re1 := regexp.MustCompile(`\n[\s\t]{1,100}LeftDelim`)
+	re2 := regexp.MustCompile(`\n[\s\t]{1,100}RightDelim`)
+
+	str := re1.ReplaceAllString(string(buff), "\n    // LeftDelim")
+	str = re2.ReplaceAllString(str, "\n    // RightDelim")
+	if err = os.WriteFile(fmt.Sprintf("%s/docs/docs.go", AppConfig.OutdirBackend), []byte(str), 0755); err != nil {
+		log.Fatal(err)
+	}
+
+}

lib/backend.go

@@ -32,6 +32,7 @@ func Backend() {
 	generateBackendTmpl()
 
 	execCommands()
+	backendFixApi()
 }
 
 // Генерирование структуры БД

lib/frontend-angular-fixapi.go

@@ -5,9 +5,10 @@ import (
 	"log"
 	"os"
 	"regexp"
+	"strings"
 )
 
-func fixApi() {
+func angularFixApi() {
 	buff, err := os.ReadFile(fmt.Sprintf("%s/src/app/module/api/encoder.ts", AppConfig.OutdirFrontend))
 	if err != nil {
 		log.Fatal(err)
@@ -23,12 +24,33 @@ func fixApi() {
 	}
 
 	re3 := regexp.MustCompile(`\s{1,10}protected basePath = '.+';`)
-	buff, err = os.ReadFile(fmt.Sprintf("%s/src/app/module/api/api/users.service.ts", AppConfig.OutdirFrontend))
+	/*buff, err = os.ReadFile(fmt.Sprintf("%s/src/app/module/api/api/users.service.ts", AppConfig.OutdirFrontend))
 	if err != nil {
 		log.Fatal(err)
 	}
 	str = re3.ReplaceAllString(string(buff), "\n    protected basePath = '/api';")
 	if err = os.WriteFile(fmt.Sprintf("%s/src/app/module/api/api/users.service.ts", AppConfig.OutdirFrontend), []byte(str), 0755); err != nil {
 		log.Fatal(err)
+	}*/
+
+	if files, err := os.ReadDir(fmt.Sprintf("%s/src/app/module/api/api", AppConfig.OutdirFrontend)); err != nil {
+		log.Fatal(err)
+	} else {
+		for _, file := range files {
+			if file.IsDir() {
+				continue
+			}
+			if strings.Contains(file.Name(), ".service.ts") {
+				buff, err = os.ReadFile(fmt.Sprintf("%s/src/app/module/api/api/%s", AppConfig.OutdirFrontend, file.Name()))
+				if err != nil {
+					log.Fatal(err)
+				}
+				str = re3.ReplaceAllString(string(buff), fmt.Sprintf("\n\n    protected basePath = '%s';", Project.BasePath))
+				if err = os.WriteFile(fmt.Sprintf("%s/src/app/module/api/api/%s", AppConfig.OutdirFrontend, file.Name()), []byte(str), 0755); err != nil {
+					log.Fatal(err)
+				}
+			}
+		}
 	}
+
 }

lib/frontend-angular.go

@@ -129,10 +129,6 @@ func generateFrontendAngularTmpl() {
 			FileIn:  "tmpl/frontend/angular/src/app/app.component.ts.tmpl",
 			FileOut: filepath.Join(AppConfig.OutdirFrontend, "src", "app", "app.component.ts"),
 		},
-		{
-			FileIn:  "tmpl/frontend/angular/src/app/app.module.ts.tmpl",
-			FileOut: filepath.Join(AppConfig.OutdirFrontend, "src", "app", "app.module.ts"),
-		},
 		{
 			FileIn:  "tmpl/frontend/angular/src/assets/gitkeep.tmpl",
 			FileOut: filepath.Join(AppConfig.OutdirFrontend, "src", "assets", ".gitkeep"),
@@ -203,6 +199,11 @@ func generateFrontendAngularTmpl() {
 			FileOut: filepath.Join(AppConfig.OutdirFrontend, "swagger-codegen-cli-2.4.32.jar"),
 		},
 	}
+	/*{
+		FileIn:  "tmpl/frontend/angular/src/app/app.module.ts.tmpl",
+		FileOut: filepath.Join(AppConfig.OutdirFrontend, "src", "app", "app.module.ts"),
+	},*/
+	templ.PrepareTmplIsNotExists("tmpl/frontend/angular/src/app/app.module.ts.tmpl", Project, filepath.Join(AppConfig.OutdirFrontend, "src", "app", "app.module.ts"))
 
 	if len(staticTmpls) > 0 {
 		for _, staticTmpl := range staticTmpls {

lib/frontend.go

@@ -11,7 +11,7 @@ func Frontend() {
 	case "angular":
 		generateFrontendAngularTmpl()
 		execCommandsFrontendAngular()
-		fixApi()
+		angularFixApi()
 	default:
 		log.Fatalf("Unknow param lang in frontend \"%s\"", Project.Frontend.Lang)
 	}

lib/templ/template.go

@@ -111,7 +111,8 @@ func FieldDBName(field *structs.Field) (res string) {
 	if res == "" {
 		log.Fatal("Shoudl be set name for field")
 	}
-	res = strings.ToLower(res)
+	//res = strings.ToLower(res)
+	res = FieldNameLowerPrepare(res)
 	return
 }