go/crud_generator
1
0
Fork 0
mirror of https://github.com/ManyakRus/crud_generator.git synced 2025-02-03 09:57:21 +02:00
Code Issues Releases Activity

сделал убрал из constants

Browse Source
This commit is contained in:
Nikitin Aleksandr 2024-09-20 14:58:46 +03:00
parent 389996f7a2
commit b18eae139b
47 changed files with 463 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
bin/templates/configs_/settings.txt
View File

@ -393,3 +393,92 @@ TEMPLATES_GRPC_CLIENT_TABLES_READALL_FUNCTION_FILENAME="grpc_client_table_readal
#TEMPLATES_GRPC_CLIENT_TABLES_READALL_FUNCTION_TEST_FILENAME - short filename of "grpc_client_table_readall_function_test.go_" file
TEMPLATES_GRPC_CLIENT_TABLES_READALL_FUNCTION_TEST_FILENAME="grpc_client_table_readall_function_test.go_"
#FILE_PERMISSIONS - linux file permissions, integer 438 = octal 0666
FILE_PERMISSIONS = 438
#GENERATION_PROTO_FILENAME - filename of "generation_code.sh" file
GENERATION_PROTO_FILENAME = "generation_code.sh"
#GRPC_CLIENT_FILENAME - filename of "grpc_client.go" file
GRPC_CLIENT_FILENAME = "grpc_client.go"
#GRPC_CLIENT_TEST_FILENAME - filename of "grpc_client_test.go" file
GRPC_CLIENT_TEST_FILENAME = "grpc_client_test.go"
#NRPC_CLIENT_FILENAME - filename of "nrpc_client.go" file
NRPC_CLIENT_FILENAME = "nrpc_client.go"
#NRPC_CLIENT_TEST_FILENAME - filename of "nrpc_client_test.go" file
NRPC_CLIENT_TEST_FILENAME = "nrpc_client_test.go"
#NRPC_CLIENT_TABLE_FILENAME - filename of "nrpc_client_table.go" file
NRPC_CLIENT_TABLE_FILENAME = "nrpc_client_table.go"
#NRPC_CLIENT_TABLE_TEST_FILENAME - filename of "nrpc_client_table_test.go" file
NRPC_CLIENT_TABLE_TEST_FILENAME = "nrpc_client_table_test.go"
#SERVER_GRPC_STARTER_FILENAME - filename of "server_grpc_starter.go" file
SERVER_GRPC_STARTER_FILENAME = "server_grpc_starter.go"
#SERVER_GRPC_FUNC_FILENAME - filename of "server_grpc_func.go" file
SERVER_GRPC_FUNC_FILENAME = "server_grpc_func.go"
#MAKEFILE_FILENAME - filename of "Makefile" file
MAKEFILE_FILENAME = "Makefile"
#ENV_FILENAME - filename of ".env" file
ENV_FILENAME = ".env"
#STARTER_TABLES_FILENAME - filename of "starter_tables.go_" file
STARTER_TABLES_FILENAME = "starter_tables.go_"
#STARTER_TABLES_TEST_FILENAME - filename of "starter_tables_test.go_" file
STARTER_TABLES_TEST_FILENAME = "starter_tables_test.go_"
#STARTER_TABLES_MANUAL_FILENAME - filename of "starter_tables_manual.go_" file
STARTER_TABLES_MANUAL_FILENAME = "starter_tables_manual.go_"
#STARTER_TABLES_TEST_MANUAL_FILENAME - filename of "starter_tables_manual_test.go_" file
STARTER_TABLES_TEST_MANUAL_FILENAME = "starter_tables_manual_test.go_"
#STARTER_TABLES_PREFIX - prefix "crud_starter_" for files
STARTER_TABLES_PREFIX = "crud_starter_"
#CRUD_TABLES_FREFIX - prefix "crud_" for files
CRUD_TABLES_FREFIX = "crud_"
#MODEL_TABLE_MANUAL_FILENAME - filename of "model_table_manual.go_" file
MODEL_TABLE_MANUAL_FILENAME = "model_table_manual.go_"
#MODEL_TABLE_UPDATE_FILENAME - filename of "model_table_update.go_" file
MODEL_TABLE_UPDATE_FILENAME = "model_table_update.go_"
#SERVER_GRPC_TABLE_UPDATE_FUNC_FILENAME - filename of "server_grpc_table_update_func.go_" file
SERVER_GRPC_TABLE_UPDATE_FUNC_FILENAME = "server_grpc_table_update_func.go_"
#SERVER_GRPC_TABLE_UPDATE_FUNC_TEST_FILENAME - filename of "server_grpc_table_update_func_test.go_" file
SERVER_GRPC_TABLE_UPDATE_FUNC_TEST_FILENAME = "server_grpc_table_update_func_test.go_"
#GRPC_CLIENT_TABLE_UPDATE_FUNC_FILENAME - filename of "grpc_client_table_update_func.go_" file
GRPC_CLIENT_TABLE_UPDATE_FUNC_FILENAME = "grpc_client_table_update_func.go_"
#GRPC_CLIENT_TABLE_UPDATE_FUNC_TEST_FILENAME - filename of "grpc_client_table_update_func_test.go_" file
GRPC_CLIENT_TABLE_UPDATE_FUNC_TEST_FILENAME = "grpc_client_table_update_func_test.go_"
#CRUD_TABLES_CACHE_FILENAME - filename of "crud_table_cache.go_" file
CRUD_TABLES_CACHE_FILENAME = "crud_table_cache.go_"
#CRUD_TABLES_CACHE_TEST_FILENAME - filename of "crud_table_cache_test.go_" file
CRUD_TABLES_CACHE_TEST_FILENAME = "crud_table_cache_test.go_"
#SERVER_GRPC_TABLE_CACHE_FILENAME - filename of "server_grpc_table_cache.go_" file
SERVER_GRPC_TABLE_CACHE_FILENAME = "server_grpc_table_cache.go_"
#SERVER_GRPC_TABLE_CACHE_TEST_FILENAME - filename of "server_grpc_table_cache_test.go_" file
SERVER_GRPC_TABLE_CACHE_TEST_FILENAME = "server_grpc_table_cache_test.go_"
#TEXT_READALL - "ReadAll" function name
TEXT_READALL = "ReadAll"

196
internal/config/config.go
View File

@ -6,6 +6,7 @@ import (
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"os"
"strconv"
"strings"
)
@ -152,6 +153,50 @@ type SettingsINI struct {
TEMPLATES_CRUD_FUNC_FOLDERNAME string
TEMPLATES_CRUD_FUNC_FILENAME string
TEMPLATES_CRUD_FUNC_TEST_FILENAME string
//
FILE_PERMISSIONS uint32 //= 0666
GENERATION_PROTO_FILENAME string
GRPC_CLIENT_FILENAME string
GRPC_CLIENT_TEST_FILENAME string
NRPC_CLIENT_FILENAME string
NRPC_CLIENT_TEST_FILENAME string
NRPC_CLIENT_TABLE_FILENAME string
NRPC_CLIENT_TABLE_TEST_FILENAME string
SERVER_GRPC_STARTER_FILENAME string
SERVER_GRPC_FUNC_FILENAME string
MAKEFILE_FILENAME string
ENV_FILENAME string
STARTER_TABLES_FILENAME string
STARTER_TABLES_TEST_FILENAME string
STARTER_TABLES_MANUAL_FILENAME string
STARTER_TABLES_TEST_MANUAL_FILENAME string
STARTER_TABLES_PREFIX string
CRUD_TABLES_FREFIX string
MODEL_TABLE_MANUAL_FILENAME string
MODEL_TABLE_UPDATE_FILENAME string
SERVER_GRPC_TABLE_UPDATE_FUNC_FILENAME string
SERVER_GRPC_TABLE_UPDATE_FUNC_TEST_FILENAME string
GRPC_CLIENT_TABLE_UPDATE_FUNC_FILENAME string
GRPC_CLIENT_TABLE_UPDATE_FUNC_TEST_FILENAME string
CRUD_TABLES_CACHE_FILENAME string
CRUD_TABLES_CACHE_TEST_FILENAME string
SERVER_GRPC_TABLE_CACHE_FILENAME string
SERVER_GRPC_TABLE_CACHE_TEST_FILENAME string
TEXT_READALL string
}
func Getenv(Name string, IsRequired bool) string {
@ -837,6 +882,157 @@ func FillSettings() {
Settings.TEMPLATES_CRUD_FUNC_TEST_FILENAME = s
//--------------------------------------------
//
Name = "FILE_PERMISSIONS"
s = Getenv(Name, true)
x, err := strconv.Atoi(s)
if err != nil {
x = 0666
log.Error("FILE_PERMISSIONS error: ", err)
}
Settings.FILE_PERMISSIONS = uint32(x)
//
Name = "GENERATION_PROTO_FILENAME"
s = Getenv(Name, true)
Settings.GENERATION_PROTO_FILENAME = s
//
Name = "GRPC_CLIENT_FILENAME"
s = Getenv(Name, true)
Settings.GRPC_CLIENT_FILENAME = s
//
Name = "GRPC_CLIENT_TEST_FILENAME"
s = Getenv(Name, true)
Settings.GRPC_CLIENT_TEST_FILENAME = s
//
Name = "NRPC_CLIENT_FILENAME"
s = Getenv(Name, true)
Settings.NRPC_CLIENT_FILENAME = s
//
Name = "NRPC_CLIENT_TEST_FILENAME"
s = Getenv(Name, true)
Settings.NRPC_CLIENT_TEST_FILENAME = s
//
Name = "NRPC_CLIENT_TABLE_FILENAME"
s = Getenv(Name, true)
Settings.NRPC_CLIENT_TABLE_FILENAME = s
//
Name = "NRPC_CLIENT_TABLE_TEST_FILENAME"
s = Getenv(Name, true)
Settings.NRPC_CLIENT_TABLE_TEST_FILENAME = s
//
Name = "SERVER_GRPC_STARTER_FILENAME"
s = Getenv(Name, true)
Settings.SERVER_GRPC_STARTER_FILENAME = s
//
Name = "SERVER_GRPC_FUNC_FILENAME"
s = Getenv(Name, true)
Settings.SERVER_GRPC_FUNC_FILENAME = s
//
Name = "MAKEFILE_FILENAME"
s = Getenv(Name, true)
Settings.MAKEFILE_FILENAME = s
//
Name = "ENV_FILENAME"
s = Getenv(Name, true)
Settings.ENV_FILENAME = s
//
Name = "STARTER_TABLES_FILENAME"
s = Getenv(Name, true)
Settings.STARTER_TABLES_FILENAME = s
//
Name = "STARTER_TABLES_TEST_FILENAME"
s = Getenv(Name, true)
Settings.STARTER_TABLES_TEST_FILENAME = s
//
Name = "STARTER_TABLES_MANUAL_FILENAME"
s = Getenv(Name, true)
Settings.STARTER_TABLES_MANUAL_FILENAME = s
//
Name = "STARTER_TABLES_TEST_MANUAL_FILENAME"
s = Getenv(Name, true)
Settings.STARTER_TABLES_TEST_MANUAL_FILENAME = s
//
Name = "STARTER_TABLES_PREFIX"
s = Getenv(Name, true)
Settings.STARTER_TABLES_PREFIX = s
//
Name = "CRUD_TABLES_FREFIX"
s = Getenv(Name, true)
Settings.CRUD_TABLES_FREFIX = s
//
Name = "MODEL_TABLE_MANUAL_FILENAME"
s = Getenv(Name, true)
Settings.MODEL_TABLE_MANUAL_FILENAME = s
//
Name = "MODEL_TABLE_UPDATE_FILENAME"
s = Getenv(Name, true)
Settings.MODEL_TABLE_UPDATE_FILENAME = s
//
Name = "SERVER_GRPC_TABLE_UPDATE_FUNC_FILENAME"
s = Getenv(Name, true)
Settings.SERVER_GRPC_TABLE_UPDATE_FUNC_FILENAME = s
//
Name = "SERVER_GRPC_TABLE_UPDATE_FUNC_TEST_FILENAME"
s = Getenv(Name, true)
Settings.SERVER_GRPC_TABLE_UPDATE_FUNC_TEST_FILENAME = s
//
Name = "GRPC_CLIENT_TABLE_UPDATE_FUNC_FILENAME"
s = Getenv(Name, true)
Settings.GRPC_CLIENT_TABLE_UPDATE_FUNC_FILENAME = s
//
Name = "GRPC_CLIENT_TABLE_UPDATE_FUNC_TEST_FILENAME"
s = Getenv(Name, true)
Settings.GRPC_CLIENT_TABLE_UPDATE_FUNC_TEST_FILENAME = s
//
Name = "CRUD_TABLES_CACHE_FILENAME"
s = Getenv(Name, true)
Settings.CRUD_TABLES_CACHE_FILENAME = s
//
Name = "CRUD_TABLES_CACHE_TEST_FILENAME"
s = Getenv(Name, true)
Settings.CRUD_TABLES_CACHE_TEST_FILENAME = s
//
Name = "SERVER_GRPC_TABLE_CACHE_FILENAME"
s = Getenv(Name, true)
Settings.SERVER_GRPC_TABLE_CACHE_FILENAME = s
//
Name = "SERVER_GRPC_TABLE_CACHE_TEST_FILENAME"
s = Getenv(Name, true)
Settings.SERVER_GRPC_TABLE_CACHE_TEST_FILENAME = s
//
Name = "TEXT_READALL"
s = Getenv(Name, true)
Settings.TEXT_READALL = s
}
// CurrentDirectory - возвращает текущую директорию ОС

58
internal/constants/constants.go
View File

@ -6,62 +6,8 @@ const TEXT_HELP = `
Need fill settings in settings.txt file
`
//const FolderTemplates string = "templates"
//
//const FolderReady string = "ready"
const FILE_PERMISSIONS = 0666
// TEMPLATES_FOLDER_NAME - folder name with all templates
var TEMPLATES_FOLDER_NAME = "templates"
// CONFIG_FOLDER_NAME - folder name with config files
const CONFIG_FOLDER_NAME = "configs_"
const TemplateFilenameCrudGo = "crud.go_"
const TemplateFilenameCrudGoTest = "crud_test.go_"
//const SETTINGS_FOLDER_NAME = "templates/configs_"
const GENERATION_PROTO_FILENAME = "generation_code.sh"
const GRPC_CLIENT_FILENAME = "grpc_client.go"
const GRPC_CLIENT_TEST_FILENAME = "grpc_client_test.go"
const NRPC_CLIENT_FILENAME = "nrpc_client.go"
const NRPC_CLIENT_TEST_FILENAME = "nrpc_client_test.go"
const NRPC_CLIENT_TABLE_FILENAME = "nrpc_client_table.go"
const NRPC_CLIENT_TABLE_TEST_FILENAME = "nrpc_client_table_test.go"
const SERVER_GRPC_STARTER_FILENAME = "server_grpc_starter.go"
const SERVER_GRPC_FUNC_FILENAME = "server_grpc_func.go"
const MAKEFILE_FILENAME = "Makefile"
const ENV_FILENAME = ".env"
const STARTER_TABLES_FILENAME = "starter_tables.go_"
const STARTER_TABLES_TEST_FILENAME = "starter_tables_test.go_"
const STARTER_TABLES_MANUAL_FILENAME = "starter_tables_manual.go_"
const STARTER_TABLES_TEST_MANUAL_FILENAME = "starter_tables_manual_test.go_"
const STARTER_TABLES_PREFIX = "crud_starter_"
const CRUD_TABLES_FREFIX = "crud_"
const MODEL_TABLE_MANUAL_FILENAME = "model_table_manual.go_"
const MODEL_TABLE_UPDATE_FILENAME = "model_table_update.go_"
const SERVER_GRPC_TABLE_UPDATE_FUNC_FILENAME = "server_grpc_table_update_func.go_"
const SERVER_GRPC_TABLE_UPDATE_FUNC_TEST_FILENAME = "server_grpc_table_update_func_test.go_"
const GRPC_CLIENT_TABLE_UPDATE_FUNC_FILENAME = "grpc_client_table_update_func.go_"
const GRPC_CLIENT_TABLE_UPDATE_FUNC_TEST_FILENAME = "grpc_client_table_update_func_test.go_"
const CRUD_TABLES_CACHE_FILENAME = "crud_table_cache.go_"
const CRUD_TABLES_CACHE_TEST_FILENAME = "crud_table_cache_test.go_"
const TEXT_CACHE_REMOVE = "cache.Remove("
const SERVER_GRPC_TABLE_CACHE_FILENAME = "server_grpc_table_cache.go_"
const SERVER_GRPC_TABLE_CACHE_TEST_FILENAME = "server_grpc_table_cache_test.go_"
const TEXT_OTVET_ID_ALIAS = "Otvet.ID = AliasFromInt(ID)" //"Otvet.ID = ID"
const TEXT_CACHE_SIZE_1000 = "CACHE_SIZE"
const TEXT_READALL = "ReadAll"

4
internal/create_files/alias/alias.go
View File

@ -2,10 +2,10 @@ package alias
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
)
@ -49,7 +49,7 @@ func CreateAlias() error {
TextAlias := string(bytes)
//запись файла в bin
err = os.WriteFile(FilenameReadyAlias, []byte(TextAlias), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyAlias, []byte(TextAlias), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

4
internal/create_files/constants_file/constants_file.go
View File

@ -2,11 +2,11 @@ package constants_file
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -53,7 +53,7 @@ func CreateFileConstants() error {
TextConstants = strings.ReplaceAll(TextConstants, ServiceNameTemplate, ServiceNameNew)
//запись файла
err = os.WriteFile(FilenameReadyConstants, []byte(TextConstants), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyConstants, []byte(TextConstants), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

5
internal/create_files/create_files.go
View File

@ -4,7 +4,6 @@ import (
"errors"
"fmt"
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/mini_func"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
@ -711,7 +710,7 @@ func Find_GRPCClientTableURL(TableName string) string {
func Find_CrudStarterTableURL(TableName string) string {
Otvet := ""
Otvet = config.Settings.SERVICE_REPOSITORY_URL + "/" + config.Settings.TEMPLATE_FOLDERNAME_CRUD_STARTER + "/" + constants.STARTER_TABLES_PREFIX + TableName
Otvet = config.Settings.SERVICE_REPOSITORY_URL + "/" + config.Settings.TEMPLATE_FOLDERNAME_CRUD_STARTER + "/" + config.Settings.STARTER_TABLES_PREFIX + TableName
return Otvet
}
@ -720,7 +719,7 @@ func Find_CrudStarterTableURL(TableName string) string {
func Find_CrudTableURL(TableName string) string {
Otvet := ""
Otvet = config.Settings.SERVICE_REPOSITORY_URL + "/" + config.Settings.TEMPLATE_FOLDERNAME_CRUD + "/" + constants.CRUD_TABLES_FREFIX + TableName
Otvet = config.Settings.SERVICE_REPOSITORY_URL + "/" + config.Settings.TEMPLATE_FOLDERNAME_CRUD + "/" + config.Settings.CRUD_TABLES_FREFIX + TableName
return Otvet
}

6
internal/create_files/crud/crud_functions.go
View File

@ -2,11 +2,11 @@ package crud
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -65,7 +65,7 @@ func CreateCrud() error {
TextCrud = create_files.Delete_EmptyImport(TextCrud)
//запись файла
err = os.WriteFile(FilenameReadyCrud, []byte(TextCrud), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyCrud, []byte(TextCrud), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -120,7 +120,7 @@ func CreateCrudTest() error {
TextCrud = create_files.Delete_EmptyImport(TextCrud)
//запись файла
err = os.WriteFile(FilenameReadyCrud, []byte(TextCrud), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyCrud, []byte(TextCrud), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

18
internal/create_files/crud_starter/crud_starter.go
View File

@ -2,12 +2,12 @@ package crud_starter
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"sort"
"strings"
@ -90,7 +90,7 @@ func CreateFile_CrudStarter(MapAll map[string]*types.Table) error {
TextCrudStarter = create_files.Delete_EmptyImport(TextCrudStarter)
//запись файла
err = os.WriteFile(FilenameReadyCrudStarter, []byte(TextCrudStarter), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyCrudStarter, []byte(TextCrudStarter), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -142,7 +142,7 @@ import (`
// FindTextImportStarter1 - возвращает текст импорта crud_starter_ для 1 таблицы
func FindTextImportStarter1(Table1 *types.Table) string {
TableName := strings.ToLower(Table1.Name)
DB_URL := config.Settings.SERVICE_REPOSITORY_URL + "/" + config.Settings.TEMPLATE_FOLDERNAME_CRUD_STARTER + "/" + constants.STARTER_TABLES_PREFIX + TableName
DB_URL := config.Settings.SERVICE_REPOSITORY_URL + "/" + config.Settings.TEMPLATE_FOLDERNAME_CRUD_STARTER + "/" + config.Settings.STARTER_TABLES_PREFIX + TableName
Otvet := "\n\t\"" + DB_URL + `"`
return Otvet
@ -226,7 +226,7 @@ func InitCrudTransport_DB() {`
// FindTextDB1 - возвращает текст для 1 таблицы
func FindTextDB1(Table1 *types.Table) string {
TableName := strings.ToLower(Table1.Name)
Otvet := "\n\t" + constants.STARTER_TABLES_PREFIX + TableName + ".SetCrudInterface(" + config.Settings.PREFIX_CRUD + TableName + ".Crud_DB{})"
Otvet := "\n\t" + config.Settings.STARTER_TABLES_PREFIX + TableName + ".SetCrudInterface(" + config.Settings.PREFIX_CRUD + TableName + ".Crud_DB{})"
return Otvet
}
@ -274,7 +274,7 @@ func InitCrudTransport_GRPC() {`
// FindTextNRPC1 - возвращает текст для 1 таблицы
func FindTextGRPC1(Table1 *types.Table) string {
TableName := strings.ToLower(Table1.Name)
Otvet := "\n\t" + constants.STARTER_TABLES_PREFIX + TableName + ".SetCrudInterface(grpc_" + TableName + ".Crud_GRPC{})"
Otvet := "\n\t" + config.Settings.STARTER_TABLES_PREFIX + TableName + ".SetCrudInterface(grpc_" + TableName + ".Crud_GRPC{})"
return Otvet
}
@ -322,7 +322,7 @@ func InitCrudTransport_NRPC() {`
// FindTextNRPC1 - возвращает текст 1 таблицы
func FindTextNRPC1(Table1 *types.Table) string {
TableName := strings.ToLower(Table1.Name)
Otvet := "\n\t" + constants.STARTER_TABLES_PREFIX + TableName + ".SetCrudInterface(nrpc_" + TableName + ".Crud_NRPC{})"
Otvet := "\n\t" + config.Settings.STARTER_TABLES_PREFIX + TableName + ".SetCrudInterface(nrpc_" + TableName + ".Crud_NRPC{})"
return Otvet
}
@ -381,7 +381,7 @@ func CreateFileCrudStarter_manual(MapAll map[string]*types.Table) error {
TextCrudStarter = create_files.Delete_EmptyImport(TextCrudStarter)
//запись файла
err = os.WriteFile(FilenameReadyCrudStarter, []byte(TextCrudStarter), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyCrudStarter, []byte(TextCrudStarter), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -426,7 +426,7 @@ func initCrudTransport_manual_DB() {`
// FindTextDB_manual1 - возвращает текст для 1 таблицы
func FindTextDB_manual1(Table1 *types.Table) string {
TableName := strings.ToLower(Table1.Name)
Otvet := "\n\t" + constants.STARTER_TABLES_PREFIX + TableName + ".SetCrudManualInterface(" + config.Settings.PREFIX_CRUD + TableName + ".Crud_DB{})"
Otvet := "\n\t" + config.Settings.STARTER_TABLES_PREFIX + TableName + ".SetCrudManualInterface(" + config.Settings.PREFIX_CRUD + TableName + ".Crud_DB{})"
return Otvet
}
@ -473,7 +473,7 @@ func initCrudTransport_manual_GRPC() {`
// FindTextGRPC_manual1 - возвращает текст для 1 таблицы
func FindTextGRPC_manual1(Table1 *types.Table) string {
TableName := strings.ToLower(Table1.Name)
Otvet := "\n\t" + constants.STARTER_TABLES_PREFIX + TableName + ".SetCrudManualInterface(grpc_" + TableName + ".Crud_GRPC{})"
Otvet := "\n\t" + config.Settings.STARTER_TABLES_PREFIX + TableName + ".SetCrudManualInterface(grpc_" + TableName + ".Crud_GRPC{})"
return Otvet
}

34
internal/create_files/crud_starter_tables/crud_starter_tables.go
View File

@ -2,12 +2,12 @@ package crud_starter_tables
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -71,10 +71,10 @@ func CreateFiles(Table1 *types.Table) error {
DirTemplatesDB := DirTemplates + config.Settings.TEMPLATE_FOLDERNAME_CRUD_STARTER + micro.SeparatorFile() + "starter_tables" + micro.SeparatorFile()
DirReadyDB := DirReady + config.Settings.TEMPLATE_FOLDERNAME_CRUD_STARTER + micro.SeparatorFile()
FilenameTemplateDB := DirTemplatesDB + constants.STARTER_TABLES_FILENAME
FilenameTemplateDB := DirTemplatesDB + config.Settings.STARTER_TABLES_FILENAME
TableName := strings.ToLower(Table1.Name)
DirReadyTable := DirReadyDB + constants.STARTER_TABLES_PREFIX + TableName
FilenameReadyDB := DirReadyTable + micro.SeparatorFile() + constants.STARTER_TABLES_PREFIX + TableName + ".go"
DirReadyTable := DirReadyDB + config.Settings.STARTER_TABLES_PREFIX + TableName
FilenameReadyDB := DirReadyTable + micro.SeparatorFile() + config.Settings.STARTER_TABLES_PREFIX + TableName + ".go"
//создадим каталог
ok, err := micro.FileExists(DirReadyTable)
@ -120,7 +120,7 @@ func CreateFiles(Table1 *types.Table) error {
TextDB = create_files.Delete_EmptyImport(TextDB)
//запись файла
err = os.WriteFile(FilenameReadyDB, []byte(TextDB), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyDB, []byte(TextDB), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -138,9 +138,9 @@ func CreateFiles_Test(Table1 *types.Table) error {
DirTemplatesDB := DirTemplates + config.Settings.TEMPLATE_FOLDERNAME_CRUD_STARTER + micro.SeparatorFile() + "starter_tables" + micro.SeparatorFile()
DirReadyDB := DirReady + config.Settings.TEMPLATE_FOLDERNAME_CRUD_STARTER + micro.SeparatorFile()
FilenameTemplateDB := DirTemplatesDB + constants.STARTER_TABLES_TEST_FILENAME
DirReadyTable := DirReadyDB + constants.STARTER_TABLES_PREFIX + TableName
FilenameReadyDB := DirReadyTable + micro.SeparatorFile() + constants.STARTER_TABLES_PREFIX + TableName + "_test.go"
FilenameTemplateDB := DirTemplatesDB + config.Settings.STARTER_TABLES_TEST_FILENAME
DirReadyTable := DirReadyDB + config.Settings.STARTER_TABLES_PREFIX + TableName
FilenameReadyDB := DirReadyTable + micro.SeparatorFile() + config.Settings.STARTER_TABLES_PREFIX + TableName + "_test.go"
//создадим папку готовых файлов
folders.CreateFolder(DirReadyTable)
@ -180,7 +180,7 @@ func CreateFiles_Test(Table1 *types.Table) error {
TextDB = create_files.Delete_EmptyImport(TextDB)
//запись файла
err = os.WriteFile(FilenameReadyDB, []byte(TextDB), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyDB, []byte(TextDB), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -196,10 +196,10 @@ func CreateFiles_manual(Table1 *types.Table) error {
DirTemplatesDB := DirTemplates + config.Settings.TEMPLATE_FOLDERNAME_CRUD_STARTER + micro.SeparatorFile() + "starter_tables" + micro.SeparatorFile()
DirReadyDB := DirReady + config.Settings.TEMPLATE_FOLDERNAME_CRUD_STARTER + micro.SeparatorFile()
FilenameTemplateDB := DirTemplatesDB + constants.STARTER_TABLES_MANUAL_FILENAME
FilenameTemplateDB := DirTemplatesDB + config.Settings.STARTER_TABLES_MANUAL_FILENAME
TableName := strings.ToLower(Table1.Name)
DirReadyTable := DirReadyDB + constants.STARTER_TABLES_PREFIX + TableName
FilenameReadyManual := DirReadyTable + micro.SeparatorFile() + constants.STARTER_TABLES_PREFIX + TableName + "_manual.go"
DirReadyTable := DirReadyDB + config.Settings.STARTER_TABLES_PREFIX + TableName
FilenameReadyManual := DirReadyTable + micro.SeparatorFile() + config.Settings.STARTER_TABLES_PREFIX + TableName + "_manual.go"
//создадим каталог
ok, err := micro.FileExists(DirReadyTable)
@ -244,7 +244,7 @@ func CreateFiles_manual(Table1 *types.Table) error {
TextManual = create_files.Delete_EmptyImport(TextManual)
//запись файла
err = os.WriteFile(FilenameReadyManual, []byte(TextManual), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyManual, []byte(TextManual), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -260,10 +260,10 @@ func CreateFiles_manual_test(Table1 *types.Table) error {
DirTemplatesDB := DirTemplates + config.Settings.TEMPLATE_FOLDERNAME_CRUD_STARTER + micro.SeparatorFile() + "starter_tables" + micro.SeparatorFile()
DirReadyDB := DirReady + config.Settings.TEMPLATE_FOLDERNAME_CRUD_STARTER + micro.SeparatorFile()
FilenameTemplateDB := DirTemplatesDB + constants.STARTER_TABLES_TEST_MANUAL_FILENAME
FilenameTemplateDB := DirTemplatesDB + config.Settings.STARTER_TABLES_TEST_MANUAL_FILENAME
TableName := strings.ToLower(Table1.Name)
DirReadyTable := DirReadyDB + constants.STARTER_TABLES_PREFIX + TableName
FilenameReadyManual := DirReadyTable + micro.SeparatorFile() + constants.STARTER_TABLES_PREFIX + TableName + "_manual_test.go"
DirReadyTable := DirReadyDB + config.Settings.STARTER_TABLES_PREFIX + TableName
FilenameReadyManual := DirReadyTable + micro.SeparatorFile() + config.Settings.STARTER_TABLES_PREFIX + TableName + "_manual_test.go"
//создадим каталог
ok, err := micro.FileExists(DirReadyTable)
@ -313,7 +313,7 @@ func CreateFiles_manual_test(Table1 *types.Table) error {
TextManual = create_files.Delete_EmptyImport(TextManual)
//запись файла
err = os.WriteFile(FilenameReadyManual, []byte(TextManual), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyManual, []byte(TextManual), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

14
internal/create_files/crud_tables/crud_tables_cache.go
View File

@ -2,12 +2,12 @@ package crud_tables
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -25,7 +25,7 @@ func CreateFiles_Cache(Table1 *types.Table) error {
DirTemplatesCrud := DirTemplates + config.Settings.TEMPLATE_FOLDERNAME_CRUD + micro.SeparatorFile()
DirReadyCrud := DirReady + config.Settings.TEMPLATE_FOLDERNAME_CRUD + micro.SeparatorFile() + config.Settings.PREFIX_CRUD + TableName + micro.SeparatorFile()
FilenameTemplateCache := DirTemplatesCrud + constants.CRUD_TABLES_CACHE_FILENAME
FilenameTemplateCache := DirTemplatesCrud + config.Settings.CRUD_TABLES_CACHE_FILENAME
DirReadyTable := DirReadyCrud
FilenameReadyCache := DirReadyTable + "crud_" + TableName + "_cache.go"
@ -63,7 +63,7 @@ func CreateFiles_Cache(Table1 *types.Table) error {
Count_Now := Table1.RowsCount
CACHE_ELEMENTS_COUNT := micro.MinInt64(Count_Now, CACHE_ELEMENTS_COUNT_MAX)
sCACHE_ELEMENTS_COUNT := micro.StringFromInt64(CACHE_ELEMENTS_COUNT)
TextCache = create_files.FillVariable(TextCache, constants.TEXT_CACHE_SIZE_1000, sCACHE_ELEMENTS_COUNT)
TextCache = create_files.FillVariable(TextCache, "CACHE_SIZE", sCACHE_ELEMENTS_COUNT)
ColumnPK := create_files.Find_PrimaryKeyColumn(Table1)
@ -104,7 +104,7 @@ func CreateFiles_Cache(Table1 *types.Table) error {
TextCache = create_files.Delete_EmptyLines(TextCache)
//запись файла
err = os.WriteFile(FilenameReadyCache, []byte(TextCache), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyCache, []byte(TextCache), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -122,7 +122,7 @@ func CreateFiles_Cache_Test(Table1 *types.Table) error {
DirTemplatesCrud := DirTemplates + config.Settings.TEMPLATE_FOLDERNAME_CRUD + micro.SeparatorFile()
DirReadyCrud := DirReady + config.Settings.TEMPLATE_FOLDERNAME_CRUD + micro.SeparatorFile() + config.Settings.PREFIX_CRUD + TableName + micro.SeparatorFile()
FilenameTemplateCache := DirTemplatesCrud + constants.CRUD_TABLES_CACHE_TEST_FILENAME
FilenameTemplateCache := DirTemplatesCrud + config.Settings.CRUD_TABLES_CACHE_TEST_FILENAME
DirReadyTable := DirReadyCrud
FilenameReadyCache := DirReadyTable + "crud_" + TableName + "_cache_test.go"
@ -191,7 +191,7 @@ func CreateFiles_Cache_Test(Table1 *types.Table) error {
TextCache = create_files.AddSkipNow(TextCache, Table1)
//запись файла
err = os.WriteFile(FilenameReadyCache, []byte(TextCache), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyCache, []byte(TextCache), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -211,7 +211,7 @@ func Replace_IDToAlias_OtvetID(Text string, Table1 *types.Table) string {
return Otvet
}
TextFrom := constants.TEXT_OTVET_ID_ALIAS
TextFrom := "Otvet.ID = AliasFromInt(ID)"
TextTo := TextFrom
TextTo = strings.ReplaceAll(TextFrom, " AliasFromInt(ID)", " "+TextConvert+"(ID)")

9
internal/create_files/crud_tables/crud_tables_crud.go
View File

@ -2,13 +2,13 @@ package crud_tables
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/crud_generator/internal/mini_func"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"sort"
"strings"
@ -76,7 +76,8 @@ func CreateFiles(Table1 *types.Table) error {
//кэш
if config.Settings.NEED_CREATE_CACHE_API == true {
//исправление Save()
TextDB = create_files.CommentLineInText(TextDB, constants.TEXT_CACHE_REMOVE)
const TEXT_CACHE_REMOVE = "cache.Remove("
TextDB = create_files.CommentLineInText(TextDB, TEXT_CACHE_REMOVE)
//TextDB = strings.ReplaceAll(TextDB, `//`+constants.TEXT_CACHE_REMOVE, constants.TEXT_CACHE_REMOVE)
}
@ -133,7 +134,7 @@ func CreateFiles(Table1 *types.Table) error {
TextDB = create_files.Delete_EmptyLines(TextDB)
//запись файла
err = os.WriteFile(FilenameReadyDB, []byte(TextDB), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyDB, []byte(TextDB), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -220,7 +221,7 @@ func CreateFiles_Test(Table1 *types.Table) error {
TextDB = create_files.Delete_EmptyLines(TextDB)
//запись файла
err = os.WriteFile(FilenameReadyDB, []byte(TextDB), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyDB, []byte(TextDB), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

6
internal/create_files/crud_tables/crud_tables_findby.go
View File

@ -2,11 +2,11 @@ package crud_tables
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -103,7 +103,7 @@ func CreateFiles_FindBy(Table1 *types.Table) error {
TextCrud = create_files.Delete_EmptyLines(TextCrud)
//запись файла
err = os.WriteFile(FilenameReady, []byte(TextCrud), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReady, []byte(TextCrud), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -253,7 +253,7 @@ func CreateFiles_FindBy_Test(Table1 *types.Table) error {
TextCrud = create_files.Delete_EmptyLines(TextCrud)
//запись файла
err = os.WriteFile(FilenameReady, []byte(TextCrud), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReady, []byte(TextCrud), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

6
internal/create_files/crud_tables/crud_tables_findmassby.go
View File

@ -2,11 +2,11 @@ package crud_tables
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -103,7 +103,7 @@ func CreateFiles_FindMassBy(Table1 *types.Table) error {
TextCrud = create_files.Delete_EmptyLines(TextCrud)
//запись файла
err = os.WriteFile(FilenameReady, []byte(TextCrud), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReady, []byte(TextCrud), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -270,7 +270,7 @@ func CreateFiles_FindMassBy_Test(Table1 *types.Table) error {
TextCrud = create_files.Delete_EmptyLines(TextCrud)
//запись файла
err = os.WriteFile(FilenameReady, []byte(TextCrud), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReady, []byte(TextCrud), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

6
internal/create_files/crud_tables/crud_tables_readall.go
View File

@ -2,11 +2,11 @@ package crud_tables
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -103,7 +103,7 @@ func CreateFiles_ReadAll(Table1 *types.Table) error {
TextCrud = create_files.Delete_EmptyLines(TextCrud)
//запись файла
err = os.WriteFile(FilenameReady, []byte(TextCrud), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReady, []byte(TextCrud), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -232,7 +232,7 @@ func CreateFiles_ReadAll_Test(Table1 *types.Table) error {
TextCrud = create_files.Delete_EmptyLines(TextCrud)
//запись файла
err = os.WriteFile(FilenameReady, []byte(TextCrud), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReady, []byte(TextCrud), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

9
internal/create_files/crud_tables/crud_tables_update.go
View File

@ -2,12 +2,12 @@ package crud_tables
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"sort"
"strings"
@ -82,7 +82,8 @@ func CreateFiles_UpdateEveryColumn(Table1 *types.Table) error {
//кэш
if config.Settings.NEED_CREATE_CACHE_API == true {
TextCrud = strings.ReplaceAll(TextCrud, `//`+constants.TEXT_CACHE_REMOVE, constants.TEXT_CACHE_REMOVE)
const TEXT_CACHE_REMOVE = "cache.Remove("
TextCrud = strings.ReplaceAll(TextCrud, `//`+TEXT_CACHE_REMOVE, TEXT_CACHE_REMOVE)
}
//переименование функций
@ -104,7 +105,7 @@ func CreateFiles_UpdateEveryColumn(Table1 *types.Table) error {
TextCrud = create_files.Delete_EmptyLines(TextCrud)
//запись файла
err = os.WriteFile(FilenameReadyCrudUpdateFunc, []byte(TextCrud), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyCrudUpdateFunc, []byte(TextCrud), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -279,7 +280,7 @@ func CreateFiles_UpdateEveryColumn_Test(Table1 *types.Table) error {
TextCrud = create_files.Delete_EmptyLines(TextCrud)
//запись файла
err = os.WriteFile(FilenameReadyCrudUpdate, []byte(TextCrud), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyCrudUpdate, []byte(TextCrud), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

10
internal/create_files/entities_tables/entities_tables_crud.go
View File

@ -3,12 +3,12 @@ package entities_tables
import (
"errors"
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"sort"
"strings"
@ -110,7 +110,7 @@ func CreateFiles_Model_struct(Table1 *types.Table, DirTemplatesModel, DirReadyMo
TextModel = create_files.Delete_EmptyImport(TextModel)
//запись файла
err = os.WriteFile(FilenameReadyModel, []byte(TextModel), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyModel, []byte(TextModel), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -211,7 +211,7 @@ func CreateFiles_Model_crud(Table1 *types.Table, DirTemplatesModel, DirReadyMode
TextModel = DeleteFunctions(TextModel, TableName, types.MapModelCrudDeleteFunctions)
//запись файла
err = os.WriteFile(FilenameReadyModel, []byte(TextModel), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyModel, []byte(TextModel), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -494,7 +494,7 @@ func CreateFiles_Model_Manual(Table1 *types.Table, DirTemplatesModel, DirReadyMo
//ModelName := Table1.NameGo
TableName := strings.ToLower(Table1.Name)
FilenameTemplateModel := DirTemplatesModel + constants.MODEL_TABLE_MANUAL_FILENAME
FilenameTemplateModel := DirTemplatesModel + config.Settings.MODEL_TABLE_MANUAL_FILENAME
FilenameReadyModel := DirReadyModel + TableName + "_manual.go"
//чтение файла шаблона
@ -526,7 +526,7 @@ func CreateFiles_Model_Manual(Table1 *types.Table, DirTemplatesModel, DirReadyMo
TextModel = create_files.Delete_EmptyImport(TextModel)
//запись файла
err = os.WriteFile(FilenameReadyModel, []byte(TextModel), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyModel, []byte(TextModel), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

4
internal/create_files/entities_tables/entities_tables_findby.go
View File

@ -2,11 +2,11 @@ package entities_tables
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -103,7 +103,7 @@ func CreateFiles_FindBy(Table1 *types.Table) error {
TextModel = create_files.Delete_EmptyLines(TextModel)
//запись файла
err = os.WriteFile(FilenameReady, []byte(TextModel), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReady, []byte(TextModel), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

12
internal/create_files/entities_tables/entities_tables_findmassby.go
View File

@ -2,11 +2,11 @@ package entities_tables
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -103,7 +103,7 @@ func CreateFiles_FindMassBy(Table1 *types.Table) error {
TextModel = create_files.Delete_EmptyLines(TextModel)
//запись файла
err = os.WriteFile(FilenameReady, []byte(TextModel), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReady, []byte(TextModel), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -155,7 +155,7 @@ func CreateFiles_FindMassBy_Table1(Table1 *types.Table, TextTemplateFunction str
//функция ReadAll()
if len(MassColumns1) == 0 {
FuncName := constants.TEXT_READALL
FuncName := config.Settings.TEXT_READALL
Otvet = strings.ReplaceAll(Otvet, "FindMassBy_FieldNamesWithUnderline", FuncName)
Otvet = strings.ReplaceAll(Otvet, "(m)", "()")
}
@ -258,7 +258,7 @@ func CreateFiles_FindMassBy_Test(Table1 *types.Table) error {
TextCrud = create_files.Delete_EmptyLines(TextCrud)
//запись файла
err = os.WriteFile(FilenameReady, []byte(TextCrud), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReady, []byte(TextCrud), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -310,7 +310,7 @@ func CreateFiles_FindMassBy_Test_Table1(Table1 *types.Table, TextTemplateFunctio
//функция ReadAll()
if len(MassColumns1) == 0 {
FuncName := constants.TEXT_READALL
FuncName := config.Settings.TEXT_READALL
Otvet = strings.ReplaceAll(Otvet, "FindMassBy_FieldNamesWithUnderline", FuncName)
}
@ -352,7 +352,7 @@ func AddInterfaces_FindMassBy(TextModel string, Table1 *types.Table) string {
FuncName := "FindMassBy_" + FieldNamesWithUnderline
//функция ReadAll()
if len(TableColumns1.MassColumnNames) == 0 {
FuncName = constants.TEXT_READALL
FuncName = config.Settings.TEXT_READALL
TextFunc1 = "\n\t" + FuncName + "() ([]" + Table1.NameGo + ", error)"
} else {
TextFunc1 = "\n\t" + FuncName + "(*" + Table1.NameGo + ") ([]" + Table1.NameGo + ", error)"

4
internal/create_files/entities_tables/entities_tables_readall.go
View File

@ -2,11 +2,11 @@ package entities_tables
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -103,7 +103,7 @@ func CreateFiles_ReadAll(Table1 *types.Table) error {
TextModel = create_files.Delete_EmptyLines(TextModel)
//запись файла
err = os.WriteFile(FilenameReady, []byte(TextModel), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReady, []byte(TextModel), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

6
internal/create_files/entities_tables/entities_tables_update.go
View File

@ -2,12 +2,12 @@ package entities_tables
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"sort"
"strings"
@ -30,7 +30,7 @@ func CreateFiles_UpdateEveryColumn(Table1 *types.Table) error {
//создадим папку готовых файлов
folders.CreateFolder(DirReadyModel)
FilenameTemplateModel := DirTemplatesModel + constants.MODEL_TABLE_UPDATE_FILENAME
FilenameTemplateModel := DirTemplatesModel + config.Settings.MODEL_TABLE_UPDATE_FILENAME
FilenameReadyModel := DirReadyModel + config.Settings.PREFIX_MODEL + TableName + "_update.go"
//создадим папку готовых файлов
@ -89,7 +89,7 @@ func CreateFiles_UpdateEveryColumn(Table1 *types.Table) error {
TextModel = TextModel + TextNew
//запись файла
err = os.WriteFile(FilenameReadyModel, []byte(TextModel), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyModel, []byte(TextModel), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

12
internal/create_files/env_file/env_file.go
View File

@ -2,11 +2,11 @@ package env_file
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"github.com/ManyakRus/starter/postgres_gorm"
"io/fs"
"os"
"strings"
)
@ -38,8 +38,8 @@ func CreateENV() error {
DirReady := DirBin + config.Settings.READY_FOLDERNAME + micro.SeparatorFile()
DirTemplatesMakefile := DirTemplates
DirReadyENV := DirReady
FilenameReadyENV := DirReadyENV + constants.ENV_FILENAME
FilenameTemplateENV := DirTemplatesMakefile + constants.ENV_FILENAME + "_"
FilenameReadyENV := DirReadyENV + config.Settings.ENV_FILENAME
FilenameTemplateENV := DirTemplatesMakefile + config.Settings.ENV_FILENAME + "_"
//создадим папку готовых файлов
folders.CreateFolder(DirReadyENV)
@ -92,13 +92,13 @@ func CreateENV() error {
TextMakefile = ReplaceVariable(TextMakefile, VariableName, Value)
//запись файла в корень проекта
err = os.WriteFile(FilenameReadyENV, []byte(TextMakefile), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyENV, []byte(TextMakefile), fs.FileMode(config.Settings.FILE_PERMISSIONS))
//запись файла в bin
Dir := DirReady + "bin" + micro.SeparatorFile()
folders.CreateFolder(Dir)
FilenameReadyENV = Dir + constants.ENV_FILENAME
err = os.WriteFile(FilenameReadyENV, []byte(TextMakefile), constants.FILE_PERMISSIONS)
FilenameReadyENV = Dir + config.Settings.ENV_FILENAME
err = os.WriteFile(FilenameReadyENV, []byte(TextMakefile), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

14
internal/create_files/grpc_client/grpc_client_client.go
View File

@ -2,11 +2,11 @@ package grpc_client
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -21,8 +21,8 @@ func CreateGRPCClient() error {
DirReady := DirBin + config.Settings.READY_FOLDERNAME + micro.SeparatorFile()
DirTemplatesClientGRPC := DirTemplates + config.Settings.TEMPLATE_FOLDERNAME_GRPC_CLIENT + micro.SeparatorFile()
DirReadyClientGRPC := DirReady + config.Settings.TEMPLATE_FOLDERNAME_GRPC_CLIENT + micro.SeparatorFile()
FilenameReadyMain := DirReadyClientGRPC + constants.GRPC_CLIENT_FILENAME
FilenameTemplateMain := DirTemplatesClientGRPC + constants.GRPC_CLIENT_FILENAME + "_"
FilenameReadyMain := DirReadyClientGRPC + config.Settings.GRPC_CLIENT_FILENAME
FilenameTemplateMain := DirTemplatesClientGRPC + config.Settings.GRPC_CLIENT_FILENAME + "_"
//создадим папку готовых файлов
folders.CreateFolder(DirReadyClientGRPC)
@ -89,7 +89,7 @@ func CreateGRPCClient() error {
TextGRPCClient = create_files.Delete_EmptyImport(TextGRPCClient)
//запись файла
err = os.WriteFile(FilenameReadyMain, []byte(TextGRPCClient), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyMain, []byte(TextGRPCClient), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -104,8 +104,8 @@ func CreateGRPCClientTest() error {
DirReady := DirBin + config.Settings.READY_FOLDERNAME + micro.SeparatorFile()
DirTemplatesClientGRPC := DirTemplates + config.Settings.TEMPLATE_FOLDERNAME_GRPC_CLIENT + micro.SeparatorFile()
DirReadyClientGRPC := DirReady + config.Settings.TEMPLATE_FOLDERNAME_GRPC_CLIENT + micro.SeparatorFile()
FilenameReadyMain := DirReadyClientGRPC + constants.GRPC_CLIENT_TEST_FILENAME
FilenameTemplateMain := DirTemplatesClientGRPC + constants.GRPC_CLIENT_TEST_FILENAME + "_"
FilenameReadyMain := DirReadyClientGRPC + config.Settings.GRPC_CLIENT_TEST_FILENAME
FilenameTemplateMain := DirTemplatesClientGRPC + config.Settings.GRPC_CLIENT_TEST_FILENAME + "_"
//создадим папку готовых файлов
folders.CreateFolder(DirReadyClientGRPC)
@ -144,7 +144,7 @@ func CreateGRPCClientTest() error {
TextGRPCClient = create_files.Delete_EmptyImport(TextGRPCClient)
//запись файла
err = os.WriteFile(FilenameReadyMain, []byte(TextGRPCClient), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyMain, []byte(TextGRPCClient), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

6
internal/create_files/grpc_client_func/grpc_client_func.go
View File

@ -2,11 +2,11 @@ package grpc_client_func
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -85,7 +85,7 @@ func CreateFileGRPCClientFunc() error {
}
//запись файла
err = os.WriteFile(FilenameReadyGRPCClientFunc, []byte(TextGRPCClientFunc), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyGRPCClientFunc, []byte(TextGRPCClientFunc), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -137,7 +137,7 @@ func CreateFileGRPCClientFuncTest() error {
}
//запись файла
err = os.WriteFile(FilenameReadyGRPCClientFunc, []byte(TextGRPCClientFunc), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyGRPCClientFunc, []byte(TextGRPCClientFunc), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

6
internal/create_files/grpc_client_tables/grpc_client_tables_cache.go
View File

@ -2,12 +2,12 @@ package grpc_client_tables
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -107,7 +107,7 @@ func CreateFiles_GRPC_Client_Cache(Table1 *types.Table) error {
TextGRPCClient = create_files.Delete_EmptyLines(TextGRPCClient)
//запись файла
err = os.WriteFile(FilenameReadyGRPCClient, []byte(TextGRPCClient), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyGRPCClient, []byte(TextGRPCClient), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -203,7 +203,7 @@ func CreateFiles_GRPC_Client_Cache_Test(Table1 *types.Table) error {
TextGRPCClient = create_files.Delete_EmptyLines(TextGRPCClient)
//запись файла
err = os.WriteFile(FilenameReadyCache, []byte(TextGRPCClient), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyCache, []byte(TextGRPCClient), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

6
internal/create_files/grpc_client_tables/grpc_client_tables_crud.go
View File

@ -2,12 +2,12 @@ package grpc_client_tables
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -114,7 +114,7 @@ func CreateFiles(Table1 *types.Table) error {
TextGRPCClient = create_files.Delete_EmptyLines(TextGRPCClient)
//запись файла
err = os.WriteFile(FilenameReadyGRPCClient, []byte(TextGRPCClient), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyGRPCClient, []byte(TextGRPCClient), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -209,7 +209,7 @@ func CreateFiles_Test(Table1 *types.Table) error {
TextGRPCClient = create_files.Delete_EmptyLines(TextGRPCClient)
//запись файла
err = os.WriteFile(FilenameReadyGRPCClient, []byte(TextGRPCClient), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyGRPCClient, []byte(TextGRPCClient), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

6
internal/create_files/grpc_client_tables/grpc_client_tables_findby.go
View File

@ -2,11 +2,11 @@ package grpc_client_tables
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -118,7 +118,7 @@ func CreateFiles_FindBy(Table1 *types.Table) error {
TextGRPCClient = create_files.Delete_EmptyLines(TextGRPCClient)
//запись файла
err = os.WriteFile(FilenameReady, []byte(TextGRPCClient), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReady, []byte(TextGRPCClient), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -281,7 +281,7 @@ func CreateFiles_FindBy_Test(Table1 *types.Table) error {
TextGRPCClient = create_files.Delete_EmptyLines(TextGRPCClient)
//запись файла
err = os.WriteFile(FilenameReady, []byte(TextGRPCClient), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReady, []byte(TextGRPCClient), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

10
internal/create_files/grpc_client_tables/grpc_client_tables_findmassby.go
View File

@ -2,11 +2,11 @@ package grpc_client_tables
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -118,7 +118,7 @@ func CreateFiles_FindMassBy(Table1 *types.Table) error {
TextGRPCClient = create_files.Delete_EmptyLines(TextGRPCClient)
//запись файла
err = os.WriteFile(FilenameReady, []byte(TextGRPCClient), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReady, []byte(TextGRPCClient), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -173,7 +173,7 @@ func CreateFiles_FindMassBy_Table1(Table1 *types.Table, TextTemplateFunction str
//функция ReadAll()
if len(MassColumnsString) == 0 {
FuncName := constants.TEXT_READALL
FuncName := config.Settings.TEXT_READALL
Otvet = strings.ReplaceAll(Otvet, "FindMassBy_FieldNamesWithUnderline", FuncName)
Otvet = strings.ReplaceAll(Otvet, ".RequestName", ".Request_Empty")
Otvet = strings.ReplaceAll(Otvet, "(m *lawsuit_status_types.LawsuitStatusType)", "()")
@ -288,7 +288,7 @@ func CreateFiles_FindMassBy_Test(Table1 *types.Table) error {
TextGRPCClient = create_files.Delete_EmptyLines(TextGRPCClient)
//запись файла
err = os.WriteFile(FilenameReady, []byte(TextGRPCClient), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReady, []byte(TextGRPCClient), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -343,7 +343,7 @@ func CreateFiles_FindMassBy_Test_Table1(Table1 *types.Table, TextTemplateFunctio
//функция ReadAll()
if len(MassColumnsString) == 0 {
FuncName := constants.TEXT_READALL
FuncName := config.Settings.TEXT_READALL
Otvet = strings.ReplaceAll(Otvet, "FindMassBy_FieldNamesWithUnderline", FuncName)
Otvet = strings.ReplaceAll(Otvet, ".RequestName", ".Request_Empty")
Otvet = strings.ReplaceAll(Otvet, "(&Model1)", "()")

6
internal/create_files/grpc_client_tables/grpc_client_tables_readall.go
View File

@ -2,11 +2,11 @@ package grpc_client_tables
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -118,7 +118,7 @@ func CreateFiles_ReadAll(Table1 *types.Table) error {
TextGRPCClient = create_files.Delete_EmptyLines(TextGRPCClient)
//запись файла
err = os.WriteFile(FilenameReady, []byte(TextGRPCClient), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReady, []byte(TextGRPCClient), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -246,7 +246,7 @@ func CreateFiles_ReadAll_Test(Table1 *types.Table) error {
TextGRPCClient = create_files.Delete_EmptyLines(TextGRPCClient)
//запись файла
err = os.WriteFile(FilenameReady, []byte(TextGRPCClient), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReady, []byte(TextGRPCClient), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

10
internal/create_files/grpc_client_tables/grpc_client_tables_update.go
View File

@ -2,12 +2,12 @@ package grpc_client_tables
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"sort"
"strings"
@ -26,7 +26,7 @@ func CreateFiles_UpdateEveryColumn(Table1 *types.Table) error {
DirTemplatesGRPC_Client := DirTemplates + config.Settings.TEMPLATE_FOLDERNAME_GRPC_CLIENT + micro.SeparatorFile()
DirReadyGRPC_Client := DirReady + config.Settings.TEMPLATE_FOLDERNAME_GRPC_CLIENT + micro.SeparatorFile() + config.Settings.PREFIX_CLIENT_GRPC + TableName + micro.SeparatorFile()
FilenameTemplateGRPC_ClientFunc := DirTemplatesGRPC_Client + constants.GRPC_CLIENT_TABLE_UPDATE_FUNC_FILENAME
FilenameTemplateGRPC_ClientFunc := DirTemplatesGRPC_Client + config.Settings.GRPC_CLIENT_TABLE_UPDATE_FUNC_FILENAME
DirReadyTable := DirReadyGRPC_Client
FilenameReadyGRPC_ClientUpdate := DirReadyTable + config.Settings.PREFIX_CLIENT_GRPC + TableName + "_update.go"
@ -113,7 +113,7 @@ func CreateFiles_UpdateEveryColumn(Table1 *types.Table) error {
TextGRPC_Client = create_files.Delete_EmptyLines(TextGRPC_Client)
//запись файла
err = os.WriteFile(FilenameReadyGRPC_ClientUpdate, []byte(TextGRPC_Client), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyGRPC_ClientUpdate, []byte(TextGRPC_Client), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -203,7 +203,7 @@ func CreateFiles_UpdateEveryColumn_Test(Table1 *types.Table) error {
DirTemplatesGRPC_Client := DirTemplates + config.Settings.TEMPLATE_FOLDERNAME_GRPC_CLIENT + micro.SeparatorFile()
DirReadyGRPC_Client := DirReady + config.Settings.TEMPLATE_FOLDERNAME_GRPC_CLIENT + micro.SeparatorFile() + config.Settings.PREFIX_CLIENT_GRPC + TableName + micro.SeparatorFile()
FilenameTemplateGRPC_ClientFunc := DirTemplatesGRPC_Client + constants.GRPC_CLIENT_TABLE_UPDATE_FUNC_TEST_FILENAME
FilenameTemplateGRPC_ClientFunc := DirTemplatesGRPC_Client + config.Settings.GRPC_CLIENT_TABLE_UPDATE_FUNC_TEST_FILENAME
DirReadyTable := DirReadyGRPC_Client + "tests" + micro.SeparatorFile()
FilenameReadyGRPC_ClientUpdate := DirReadyTable + config.Settings.PREFIX_CLIENT_GRPC + TableName + "_update_test.go"
@ -299,7 +299,7 @@ func CreateFiles_UpdateEveryColumn_Test(Table1 *types.Table) error {
TextGRPC_Client = create_files.Delete_EmptyLines(TextGRPC_Client)
//запись файла
err = os.WriteFile(FilenameReadyGRPC_ClientUpdate, []byte(TextGRPC_Client), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyGRPC_ClientUpdate, []byte(TextGRPC_Client), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

4
internal/create_files/main_file/main_file.go
View File

@ -2,11 +2,11 @@ package main_file
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -84,7 +84,7 @@ func CreateFileMain() error {
TextMain = create_files.Delete_EmptyImport(TextMain)
//запись файла
err = os.WriteFile(FilenameReadyMain, []byte(TextMain), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyMain, []byte(TextMain), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

10
internal/create_files/makefile/makefile.go
View File

@ -2,10 +2,10 @@ package makefile
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -37,8 +37,8 @@ func CreateMakefile() error {
DirReady := DirBin + config.Settings.READY_FOLDERNAME + micro.SeparatorFile()
DirTemplatesMakefile := DirTemplates
DirReadyMakefile := DirReady
FilenameReadyMakefile := DirReadyMakefile + constants.MAKEFILE_FILENAME
FilenameTemplateMakefile := DirTemplatesMakefile + constants.MAKEFILE_FILENAME + "_"
FilenameReadyMakefile := DirReadyMakefile + config.Settings.MAKEFILE_FILENAME
FilenameTemplateMakefile := DirTemplatesMakefile + config.Settings.MAKEFILE_FILENAME + "_"
//создадим папку готовых файлов
folders.CreateFolder(DirReadyMakefile)
@ -64,11 +64,11 @@ func CreateMakefile() error {
//заполним GENERATION_PROTO
VariableName = "GENERATION_PROTO"
Value = "cd ./" + config.Settings.TEMPLATE_FOLDERNAME_GRPC_PROTO + " && " + "./" + constants.GENERATION_PROTO_FILENAME
Value = "cd ./" + config.Settings.TEMPLATE_FOLDERNAME_GRPC_PROTO + " && " + "./" + config.Settings.GENERATION_PROTO_FILENAME
TextMakefile = ReplaceVariable(TextMakefile, VariableName, Value)
//запись файла
err = os.WriteFile(FilenameReadyMakefile, []byte(TextMakefile), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyMakefile, []byte(TextMakefile), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

14
internal/create_files/nrpc_client/nrpc_client_client.go
View File

@ -2,11 +2,11 @@ package nrpc_client
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -21,8 +21,8 @@ func CreateNRPCClient() error {
DirReady := DirBin + config.Settings.READY_FOLDERNAME + micro.SeparatorFile()
DirTemplatesClientNRPC := DirTemplates + config.Settings.TEMPLATE_FOLDERNAME_NRPC_CLIENT + micro.SeparatorFile()
DirReadyClientNRPC := DirReady + config.Settings.TEMPLATE_FOLDERNAME_NRPC_CLIENT + micro.SeparatorFile()
FilenameReadyNRPC := DirReadyClientNRPC + constants.NRPC_CLIENT_FILENAME
FilenameTemplateNRPC := DirTemplatesClientNRPC + constants.NRPC_CLIENT_FILENAME + "_"
FilenameReadyNRPC := DirReadyClientNRPC + config.Settings.NRPC_CLIENT_FILENAME
FilenameTemplateNRPC := DirTemplatesClientNRPC + config.Settings.NRPC_CLIENT_FILENAME + "_"
//создадим папку готовых файлов
folders.CreateFolder(DirReadyClientNRPC)
@ -79,7 +79,7 @@ func CreateNRPCClient() error {
TextNRPCClient = create_files.Delete_EmptyImport(TextNRPCClient)
//запись файла
err = os.WriteFile(FilenameReadyNRPC, []byte(TextNRPCClient), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyNRPC, []byte(TextNRPCClient), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -94,8 +94,8 @@ func CreateNRPCClient_Test() error {
DirReady := DirBin + config.Settings.READY_FOLDERNAME + micro.SeparatorFile()
DirTemplatesClientNRPC := DirTemplates + config.Settings.TEMPLATE_FOLDERNAME_NRPC_CLIENT + micro.SeparatorFile()
DirReadyClientNRPC := DirReady + config.Settings.TEMPLATE_FOLDERNAME_NRPC_CLIENT + micro.SeparatorFile()
FilenameReadyNRPC := DirReadyClientNRPC + constants.NRPC_CLIENT_TEST_FILENAME
FilenameTemplateNRPC := DirTemplatesClientNRPC + constants.NRPC_CLIENT_TEST_FILENAME + "_"
FilenameReadyNRPC := DirReadyClientNRPC + config.Settings.NRPC_CLIENT_TEST_FILENAME
FilenameTemplateNRPC := DirTemplatesClientNRPC + config.Settings.NRPC_CLIENT_TEST_FILENAME + "_"
//создадим папку готовых файлов
folders.CreateFolder(DirReadyClientNRPC)
@ -136,7 +136,7 @@ func CreateNRPCClient_Test() error {
TextNRPCClient = create_files.Delete_EmptyImport(TextNRPCClient)
//запись файла
err = os.WriteFile(FilenameReadyNRPC, []byte(TextNRPCClient), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyNRPC, []byte(TextNRPCClient), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

4
internal/create_files/nrpc_client_tables/nrpc_client_tables.go
View File

@ -113,7 +113,7 @@ package nrpc_client_tables
// TextNRPCClient = create_files.DeleteEmptyImport(TextNRPCClient)
//
// //запись файла
// err = os.WriteFile(FilenameReadyNRPCClient, []byte(TextNRPCClient), constants.FILE_PERMISSIONS)
// err = os.WriteFile(FilenameReadyNRPCClient, []byte(TextNRPCClient), fs.FileMode(config.Settings.FILE_PERMISSIONS))
//
// return err
//}
@ -193,7 +193,7 @@ package nrpc_client_tables
// TextNRPCClient = create_files.DeleteEmptyImport(TextNRPCClient)
//
// //запись файла
// err = os.WriteFile(FilenameReadyNRPCClient, []byte(TextNRPCClient), constants.FILE_PERMISSIONS)
// err = os.WriteFile(FilenameReadyNRPCClient, []byte(TextNRPCClient), fs.FileMode(config.Settings.FILE_PERMISSIONS))
//
// return err
//}

4
internal/create_files/protobuf/protobuf.go
View File

@ -2,13 +2,13 @@ package protobuf
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/crud_generator/pkg/dbmeta"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"sort"
"strconv"
@ -129,7 +129,7 @@ func CreateFileProto(MapAll map[string]*types.Table) error {
TextProto = create_files.Delete_EmptyLines(TextProto)
//запись файла
err = os.WriteFile(FilenameReadyProto, []byte(TextProto), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyProto, []byte(TextProto), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

4
internal/create_files/protobuf/protobuf_findmassby.go
View File

@ -1,7 +1,7 @@
package protobuf
import (
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/types"
"strings"
@ -57,7 +57,7 @@ func FindText_FindMassBy1(TableColumns1 types.TableColumns) string {
FuncName := "FindMassBy_" + TextFields
//функция ReadAll()
if len(TableColumns1.Columns) == 0 {
FuncName = constants.TEXT_READALL
FuncName = config.Settings.TEXT_READALL
TextRequest = "Request_Empty"
}

6
internal/create_files/readme_file/readme_file.go
View File

@ -2,11 +2,11 @@ package readme_file
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -63,7 +63,7 @@ func CreateReadmeMD() error {
TextReadmeFile = strings.ReplaceAll(TextReadmeFile, CrudStarterURLOld, CrudStarterURL)
//запись файла
err = os.WriteFile(FilenameReadyReadmeFile, []byte(TextReadmeFile), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyReadmeFile, []byte(TextReadmeFile), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -101,7 +101,7 @@ func CreateReadmeRus() error {
TextReadmeFile = strings.ReplaceAll(TextReadmeFile, CrudStarterURLOld, CrudStarterURL)
//запись файла
err = os.WriteFile(FilenameReadyReadmeFile, []byte(TextReadmeFile), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyReadmeFile, []byte(TextReadmeFile), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

8
internal/create_files/server_grpc_func/server_grpc_func.go
View File

@ -2,11 +2,11 @@ package server_grpc_func
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
)
@ -37,8 +37,8 @@ func CreateServerGRPCFunc() error {
DirReady := DirBin + config.Settings.READY_FOLDERNAME + micro.SeparatorFile()
DirTemplatesServerGRPC := DirTemplates + config.Settings.TEMPLATE_FOLDERNAME_GRPC_SERVER + micro.SeparatorFile()
DirReadyServerGRPC := DirReady + config.Settings.TEMPLATE_FOLDERNAME_GRPC_SERVER + micro.SeparatorFile()
FilenameReadyServerGRPCFunc := DirReadyServerGRPC + constants.SERVER_GRPC_FUNC_FILENAME
FilenameTemplateServerGRPCFunc := DirTemplatesServerGRPC + constants.SERVER_GRPC_FUNC_FILENAME + "_"
FilenameReadyServerGRPCFunc := DirReadyServerGRPC + config.Settings.SERVER_GRPC_FUNC_FILENAME
FilenameTemplateServerGRPCFunc := DirTemplatesServerGRPC + config.Settings.SERVER_GRPC_FUNC_FILENAME + "_"
//создадим папку готовых файлов
folders.CreateFolder(DirReadyServerGRPC)
@ -76,7 +76,7 @@ func CreateServerGRPCFunc() error {
TextGRPCFunc = create_files.Delete_EmptyImport(TextGRPCFunc)
//запись файла
err = os.WriteFile(FilenameReadyServerGRPCFunc, []byte(TextGRPCFunc), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyServerGRPCFunc, []byte(TextGRPCFunc), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

8
internal/create_files/server_grpc_starter/server_grpc_starter.go
View File

@ -2,11 +2,11 @@ package server_grpc_starter
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -38,8 +38,8 @@ func CreateFiles_ServerGRPCStarter() error {
DirReady := DirBin + config.Settings.READY_FOLDERNAME + micro.SeparatorFile()
DirTemplatesServerGRPC := DirTemplates + config.Settings.TEMPLATE_FOLDERNAME_GRPC_SERVER + micro.SeparatorFile()
DirReadyServerGRPC := DirReady + config.Settings.TEMPLATE_FOLDERNAME_GRPC_SERVER + micro.SeparatorFile()
FilenameReadyMain := DirReadyServerGRPC + constants.SERVER_GRPC_STARTER_FILENAME
FilenameTemplateMain := DirTemplatesServerGRPC + constants.SERVER_GRPC_STARTER_FILENAME + "_"
FilenameReadyMain := DirReadyServerGRPC + config.Settings.SERVER_GRPC_STARTER_FILENAME
FilenameTemplateMain := DirTemplatesServerGRPC + config.Settings.SERVER_GRPC_STARTER_FILENAME + "_"
//создадим папку готовых файлов
folders.CreateFolder(DirReadyServerGRPC)
@ -85,7 +85,7 @@ func CreateFiles_ServerGRPCStarter() error {
TextGRPCStarter = create_files.Delete_EmptyImport(TextGRPCStarter)
//запись файла
err = os.WriteFile(FilenameReadyMain, []byte(TextGRPCStarter), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyMain, []byte(TextGRPCStarter), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

10
internal/create_files/server_grpc_tables/server_grpc_tables_cache.go
View File

@ -2,12 +2,12 @@ package server_grpc_tables
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -23,7 +23,7 @@ func CreateFiles_Cache(Table1 *types.Table) error {
DirTemplatesGRPCServer := DirTemplates + config.Settings.TEMPLATE_FOLDERNAME_GRPC_SERVER + micro.SeparatorFile()
DirReadyGRPCServer := DirReady + config.Settings.TEMPLATE_FOLDERNAME_GRPC_SERVER + micro.SeparatorFile()
FilenameTemplateCache := DirTemplatesGRPCServer + constants.SERVER_GRPC_TABLE_CACHE_FILENAME
FilenameTemplateCache := DirTemplatesGRPCServer + config.Settings.SERVER_GRPC_TABLE_CACHE_FILENAME
TableName := strings.ToLower(Table1.Name)
DirReadyTable := DirReadyGRPCServer
FilenameReadyCache := DirReadyTable + config.Settings.PREFIX_SERVER_GRPC + TableName + "_cache.go"
@ -102,7 +102,7 @@ func CreateFiles_Cache(Table1 *types.Table) error {
TextGRPCServer = create_files.Delete_EmptyImport(TextGRPCServer)
//запись файла
err = os.WriteFile(FilenameReadyCache, []byte(TextGRPCServer), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyCache, []byte(TextGRPCServer), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -118,7 +118,7 @@ func CreateFiles_Cache_Test(Table1 *types.Table) error {
DirTemplatesGRPCServer := DirTemplates + config.Settings.TEMPLATE_FOLDERNAME_GRPC_SERVER + micro.SeparatorFile()
DirReadyGRPCServer := DirReady + config.Settings.TEMPLATE_FOLDERNAME_GRPC_SERVER + micro.SeparatorFile()
FilenameTemplateCache := DirTemplatesGRPCServer + constants.SERVER_GRPC_TABLE_CACHE_TEST_FILENAME
FilenameTemplateCache := DirTemplatesGRPCServer + config.Settings.SERVER_GRPC_TABLE_CACHE_TEST_FILENAME
TableName := strings.ToLower(Table1.Name)
DirReadyTable := DirReadyGRPCServer
FilenameReadyCache := DirReadyTable + config.Settings.PREFIX_SERVER_GRPC + TableName + "_cache_test.go"
@ -186,7 +186,7 @@ func CreateFiles_Cache_Test(Table1 *types.Table) error {
TextGRPCServer = create_files.AddSkipNow(TextGRPCServer, Table1)
//запись файла
err = os.WriteFile(FilenameReadyCache, []byte(TextGRPCServer), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyCache, []byte(TextGRPCServer), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

6
internal/create_files/server_grpc_tables/server_grpc_tables_crud.go
View File

@ -2,12 +2,12 @@ package server_grpc_tables
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"sort"
"strings"
@ -97,7 +97,7 @@ func CreateFiles(Table1 *types.Table) error {
TextGRPCServer = create_files.Delete_EmptyImport(TextGRPCServer)
//запись файла
err = os.WriteFile(FilenameReadyGRPCServer, []byte(TextGRPCServer), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyGRPCServer, []byte(TextGRPCServer), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -195,7 +195,7 @@ func CreateFiles_Test(Table1 *types.Table) error {
TextGRPCServer = create_files.Delete_EmptyImport(TextGRPCServer)
//запись файла
err = os.WriteFile(FilenameReadyGRPCServer, []byte(TextGRPCServer), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyGRPCServer, []byte(TextGRPCServer), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

6
internal/create_files/server_grpc_tables/server_grpc_tables_findby.go
View File

@ -2,11 +2,11 @@ package server_grpc_tables
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -106,7 +106,7 @@ func CreateFiles_FindBy(Table1 *types.Table) error {
TextGRPCServer = create_files.Delete_EmptyLines(TextGRPCServer)
//запись файла
err = os.WriteFile(FilenameReady, []byte(TextGRPCServer), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReady, []byte(TextGRPCServer), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -270,7 +270,7 @@ func CreateFiles_FindBy_Test(Table1 *types.Table) error {
TextGRPCServer = create_files.Delete_EmptyLines(TextGRPCServer)
//запись файла
err = os.WriteFile(FilenameReady, []byte(TextGRPCServer), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReady, []byte(TextGRPCServer), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

10
internal/create_files/server_grpc_tables/server_grpc_tables_findmassby.go
View File

@ -2,11 +2,11 @@ package server_grpc_tables
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -106,7 +106,7 @@ func CreateFiles_FindMassBy(Table1 *types.Table) error {
TextGRPCServer = create_files.Delete_EmptyLines(TextGRPCServer)
//запись файла
err = os.WriteFile(FilenameReady, []byte(TextGRPCServer), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReady, []byte(TextGRPCServer), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -166,7 +166,7 @@ func CreateFiles_FindMassBy_Table1(Table1 *types.Table, TextTemplateFunction str
//функция ReadAll()
if len(MassColumnsString) == 0 {
FuncName := constants.TEXT_READALL
FuncName := config.Settings.TEXT_READALL
Otvet = strings.ReplaceAll(Otvet, "FindMassBy_FieldNamesWithUnderline", FuncName)
Otvet = strings.ReplaceAll(Otvet, ".RequestName", ".Request_Empty")
}
@ -278,7 +278,7 @@ func CreateFiles_FindMassBy_Test(Table1 *types.Table) error {
TextGRPCServer = create_files.Delete_EmptyLines(TextGRPCServer)
//запись файла
err = os.WriteFile(FilenameReady, []byte(TextGRPCServer), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReady, []byte(TextGRPCServer), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -337,7 +337,7 @@ func CreateFiles_FindMassBy_Test_Table1(Table1 *types.Table, TextTemplateFunctio
//функция ReadAll()
if len(MassColumnsString) == 0 {
FuncName := constants.TEXT_READALL
FuncName := config.Settings.TEXT_READALL
Otvet = strings.ReplaceAll(Otvet, "(ctx, db, Model)", "(ctx, db)")
Otvet = strings.ReplaceAll(Otvet, "\tModel.FieldName = Request.RequestFieldName\n", "")
Otvet = strings.ReplaceAll(Otvet, "FindMassBy_FieldNamesWithUnderline", FuncName)

6
internal/create_files/server_grpc_tables/server_grpc_tables_readall.go
View File

@ -2,11 +2,11 @@ package server_grpc_tables
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -106,7 +106,7 @@ func CreateFiles_ReadAll(Table1 *types.Table) error {
TextGRPCServer = create_files.Delete_EmptyLines(TextGRPCServer)
//запись файла
err = os.WriteFile(FilenameReady, []byte(TextGRPCServer), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReady, []byte(TextGRPCServer), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -231,7 +231,7 @@ func CreateFiles_ReadAll_Test(Table1 *types.Table) error {
TextGRPCServer = create_files.Delete_EmptyLines(TextGRPCServer)
//запись файла
err = os.WriteFile(FilenameReady, []byte(TextGRPCServer), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReady, []byte(TextGRPCServer), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

10
internal/create_files/server_grpc_tables/server_grpc_tables_update.go
View File

@ -2,12 +2,12 @@ package server_grpc_tables
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"sort"
"strings"
@ -24,7 +24,7 @@ func CreateFiles_UpdateEveryColumn(Table1 *types.Table) error {
DirTemplatesGRPCServer := DirTemplates + config.Settings.TEMPLATE_FOLDERNAME_GRPC_SERVER + micro.SeparatorFile()
DirReadyGRPCServer := DirReady + config.Settings.TEMPLATE_FOLDERNAME_GRPC_SERVER + micro.SeparatorFile()
FilenameTemplateGRPCServerFunc := DirTemplatesGRPCServer + constants.SERVER_GRPC_TABLE_UPDATE_FUNC_FILENAME
FilenameTemplateGRPCServerFunc := DirTemplatesGRPCServer + config.Settings.SERVER_GRPC_TABLE_UPDATE_FUNC_FILENAME
TableName := strings.ToLower(Table1.Name)
DirReadyTable := DirReadyGRPCServer
FilenameReadyGRPCServerUpdateFunc := DirReadyTable + config.Settings.PREFIX_SERVER_GRPC + TableName + "_update.go"
@ -101,7 +101,7 @@ func CreateFiles_UpdateEveryColumn(Table1 *types.Table) error {
TextGRPCServer = create_files.Delete_EmptyLines(TextGRPCServer)
//запись файла
err = os.WriteFile(FilenameReadyGRPCServerUpdateFunc, []byte(TextGRPCServer), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyGRPCServerUpdateFunc, []byte(TextGRPCServer), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}
@ -205,7 +205,7 @@ func CreateFiles_UpdateEveryColumn_Test(Table1 *types.Table) error {
DirTemplatesGRPCServer := DirTemplates + config.Settings.TEMPLATE_FOLDERNAME_GRPC_SERVER + micro.SeparatorFile()
DirReadyGRPCServer := DirReady + config.Settings.TEMPLATE_FOLDERNAME_GRPC_SERVER + micro.SeparatorFile()
FilenameTemplateGRPCServerFunc := DirTemplatesGRPCServer + constants.SERVER_GRPC_TABLE_UPDATE_FUNC_TEST_FILENAME
FilenameTemplateGRPCServerFunc := DirTemplatesGRPCServer + config.Settings.SERVER_GRPC_TABLE_UPDATE_FUNC_TEST_FILENAME
TableName := strings.ToLower(Table1.Name)
DirReadyTable := DirReadyGRPCServer
FilenameReadyGRPCServerUpdate := DirReadyTable + config.Settings.PREFIX_SERVER_GRPC + TableName + "_update_test.go"
@ -294,7 +294,7 @@ func CreateFiles_UpdateEveryColumn_Test(Table1 *types.Table) error {
TextGRPCServer = create_files.Delete_EmptyLines(TextGRPCServer)
//запись файла
err = os.WriteFile(FilenameReadyGRPCServerUpdate, []byte(TextGRPCServer), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyGRPCServerUpdate, []byte(TextGRPCServer), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

4
internal/create_files/server_nrpc_starter/server_nrpc_starter.go
View File

@ -2,11 +2,11 @@ package server_nrpc_starter
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"strings"
)
@ -86,7 +86,7 @@ func CreateFile_ServerGRPCStarter() error {
TextNRPCStarter = create_files.Delete_EmptyImport(TextNRPCStarter)
//запись файла
err = os.WriteFile(FilenameReadyMain, []byte(TextNRPCStarter), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyMain, []byte(TextNRPCStarter), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

4
internal/create_files/tables_tables/tables_tables.go
View File

@ -3,12 +3,12 @@ package tables_tables
import (
"errors"
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/micro"
"io/fs"
"os"
"sort"
"strings"
@ -118,7 +118,7 @@ func CreateFiles_Table_struct(Table1 *types.Table, DirTemplatesTable, DirReadyTa
TextModel = create_files.Delete_EmptyImport(TextModel)
//запись файла
err = os.WriteFile(FilenameReadyModel, []byte(TextModel), constants.FILE_PERMISSIONS)
err = os.WriteFile(FilenameReadyModel, []byte(TextModel), fs.FileMode(config.Settings.FILE_PERMISSIONS))
return err
}

1
internal/load_configs/load_configs_test.go
View File

@ -3,7 +3,6 @@ package load_configs
import (
"encoding/json"
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/constants"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/starter/micro"
"os"