go/crud_generator
1
0
Fork 0
mirror of https://github.com/ManyakRus/crud_generator.git synced 2025-02-15 11:52:37 +02:00
Code Issues Releases Activity

сделал crud_func.go_

Browse Source
This commit is contained in:
Nikitin Aleksandr 2024-09-06 13:14:05 +03:00
parent a7403f1b29
commit 7622b77d5f
28 changed files with 295 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,3 +360,12 @@ TEMPLATES_GRPC_CLIENT_TABLES_FINDMASSBY_FUNCTION_FILENAME="grpc_client_table_fin
#TEMPLATES_GRPC_CLIENT_TABLES_FINDMASSBY_FUNCTION_TEST_FILENAME - short filename of "grpc_client_table_findmassby_function_test.go_" file
TEMPLATES_GRPC_CLIENT_TABLES_FINDMASSBY_FUNCTION_TEST_FILENAME="grpc_client_table_findmassby_function_test.go_"
#TEMPLATES_CRUD_FUNC_FOLDERNAME - folder name "crud_func"
TEMPLATES_CRUD_FUNC_FOLDERNAME="pkg/db/crud_func"
#TEMPLATES_CRUD_FUNC_FILENAME - short filename of "crud_func.go_" file
TEMPLATES_CRUD_FUNC_FILENAME = "crud_func.go_"
#TEMPLATES_CRUD_FUNC_TEST_FILENAME - short filename of "crud_func_test.go_" file
TEMPLATES_CRUD_FUNC_TEST_FILENAME = "crud_func_test.go_"

5
bin/templates/internal/app/grpc/server_grpc/server_grpc_table_findby_function_test.go_
View File

@ -9,9 +9,10 @@ func Test_server_LawsuitStatusType_FindBy_FieldNamesWithUnderline(t *testing.T)
server1 := &ServerGRPC{}
Otvet, err := server1.LawsuitStatusType_FindBy_FieldNamesWithUnderline(ctx, &Request)
if err != nil {
t.Log("Test_server_LawsuitStatusType_FindBy_FieldNamesWithUnderline() error: ", err)
if err != nil && crud_func.IsRecordNotFound(err) == false {
t.Error("Test_server_LawsuitStatusType_FindBy_FieldNamesWithUnderline() error: ", err)
}
if Otvet.ModelString == "" {
t.Log("Test_server_LawsuitStatusType_FindBy_FieldNamesWithUnderline() error: ModelString=''")
}

1
bin/templates/internal/app/grpc/server_grpc/server_grpc_table_findby_test.go_
View File

@ -6,6 +6,7 @@ import (
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/api/grpc_proto"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/crud_starter"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/object_model/entities/files"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/db/crud_func"
"testing"
)

4
bin/templates/internal/app/grpc/server_grpc/server_grpc_table_findmassby_function_test.go_
View File

@ -9,8 +9,8 @@ func Test_server_LawsuitStatusType_FindMassBy_FieldNamesWithUnderline(t *testing
server1 := &ServerGRPC{}
_, err := server1.LawsuitStatusType_FindMassBy_FieldNamesWithUnderline(ctx, &Request)
if err != nil {
t.Log("Test_server_LawsuitStatusType_FindMassBy_FieldNamesWithUnderline() error: ", err)
if err != nil && crud_func.IsRecordNotFound(err) == false {
t.Error("Test_server_LawsuitStatusType_FindMassBy_FieldNamesWithUnderline() error: ", err)
}
}

1
bin/templates/internal/app/grpc/server_grpc/server_grpc_table_findmassby_test.go_
View File

@ -6,6 +6,7 @@ import (
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/api/grpc_proto"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/crud_starter"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/object_model/entities/files"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/db/crud_func"
"testing"
)

4
bin/templates/pkg/db/crud/crud_tables_findby_function_test.go_
View File

@ -8,8 +8,8 @@ func TestFindBy_FieldNamesWithUnderline(t *testing.T) {
Otvet := lawsuit_status_types.LawsuitStatusType{}
Otvet.FieldName = 0
err := crud.FindBy_FieldNamesWithUnderline(&Otvet)
if err != nil {
t.Log("crud_"+TableName+"_test.TestFindBy_FieldNamesWithUnderline() FieldNamesWithComma:", FieldNamesDefault, " error: ", err)
if err != nil && crud_func.IsRecordNotFound(err) == false {
t.Error("crud_"+TableName+"_test.TestFindBy_FieldNamesWithUnderline() FieldNamesWithComma:", FieldNamesDefault, " error: ", err)
}
}

1
bin/templates/pkg/db/crud/crud_tables_findby_test.go_
View File

@ -4,6 +4,7 @@ import (
"github.com/ManyakRus/starter/config_main"
"github.com/ManyakRus/starter/postgres_gorm"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/object_model/entities/lawsuit_status_types"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/db/crud_func"
"testing"
)

4
bin/templates/pkg/db/crud/crud_tables_findmassby_function_test.go_
View File

@ -8,8 +8,8 @@ func TestFindMassBy_FieldNamesWithUnderline(t *testing.T) {
Otvet := lawsuit_status_types.LawsuitStatusType{}
Otvet.FieldName = 0
_, err := crud.FindMassBy_FieldNamesWithUnderline(&Otvet)
if err != nil {
t.Log("crud_"+TableName+"_test.TestFindMassBy_FieldNamesWithUnderline() FieldNamesWithComma:", FieldNamesDefault, " error: ", err)
if err != nil && crud_func.IsRecordNotFound(err) == false {
t.Error("crud_"+TableName+"_test.TestFindMassBy_FieldNamesWithUnderline() FieldNamesWithComma:", FieldNamesDefault, " error: ", err)
}
}

1
bin/templates/pkg/db/crud/crud_tables_findmassby_test.go_
View File

@ -4,6 +4,7 @@ import (
"github.com/ManyakRus/starter/config_main"
"github.com/ManyakRus/starter/postgres_gorm"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/object_model/entities/lawsuit_status_types"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/db/crud_func"
"testing"
)

23
bin/templates/pkg/db/crud_func/crud_func.go_ Normal file
View File

@ -0,0 +1,23 @@
package crud
import (
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/db/db_constants"
"strings"
)
// IsRecordNotFound - возвращает true если ошибка = "record not found"
func IsRecordNotFound(err error) bool {
Otvet := false
if err == nil {
return Otvet
}
TextErr := err.Error()
pos1 := strings.Index(TextErr, db_constants.TEXT_RECORD_NOT_FOUND)
if pos1 >= 0 {
Otvet = true
}
return Otvet
}

23
bin/templates/pkg/db/crud_func/crud_func_test.go_ Normal file
View File

@ -0,0 +1,23 @@
package crud
import (
"errors"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/db/db_constants"
"testing"
)
func TestIsRecordNotFound(t *testing.T) {
err := errors.New(db_constants.TEXT_RECORD_NOT_FOUND + " !")
Otvet := IsRecordNotFound(err)
if Otvet != true {
t.Error("TestIsRecordNotFound() error: false")
}
err = errors.New("rpc error: code = Unknown desc = record not found")
Otvet = IsRecordNotFound(err)
if Otvet != true {
t.Error("TestIsRecordNotFound() error: false")
}
}

7
bin/templates/pkg/network/grpc/grpc_client/grpc_client_table_findby_function_test.go_
View File

@ -1,6 +1,7 @@
func TestFindBy_FieldNamesWithUnderline(t *testing.T) {
config_main.LoadEnv()
grpc_client_func.Func_Connect_GRPC_NRPC.Connect_GRPC_NRPC()
grpc_client.Connect()
defer grpc_client.CloseConnection()
crud := grpc_lawsuit_status_types.Crud_GRPC{}
@ -8,8 +9,8 @@ func TestFindBy_FieldNamesWithUnderline(t *testing.T) {
Otvet.FieldName = 0
err := crud.FindBy_FieldNamesWithUnderline(&Otvet)
if err != nil {
t.Log("TestFindBy_FieldNamesWithUnderline() error: ", err)
if err != nil && crud_func.IsRecordNotFound(err) == false {
t.Error("TestFindBy_FieldNamesWithUnderline() error: ", err)
}
}

2
bin/templates/pkg/network/grpc/grpc_client/grpc_client_table_findby_test.go_
View File

@ -4,8 +4,8 @@ import (
"github.com/ManyakRus/starter/config_main"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/object_model/entities/lawsuit_status_types"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/network/grpc/grpc_client"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/network/grpc/grpc_client_func"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/network/grpc/grpc_client/grpc_lawsuit_status_types"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/db/crud_func"
"testing"
)

7
bin/templates/pkg/network/grpc/grpc_client/grpc_client_table_findmassby_function_test.go_
View File

@ -1,6 +1,7 @@
func TestCrud_GRPC_FindMassBy_FieldNamesWithUnderline(t *testing.T) {
config_main.LoadEnv()
grpc_client_func.Func_Connect_GRPC_NRPC.Connect_GRPC_NRPC()
grpc_client.Connect()
defer grpc_client.CloseConnection()
crud := grpc_lawsuit_status_types.Crud_GRPC{}
@ -8,8 +9,8 @@ func TestCrud_GRPC_FindMassBy_FieldNamesWithUnderline(t *testing.T) {
Model1.FieldName = 0
_, err := crud.FindMassBy_FieldNamesWithUnderline(&Model1)
if err != nil {
t.Log("TestCrud_GRPC_FindMassBy_FieldNamesWithUnderline() error: ", err)
if err != nil && crud_func.IsRecordNotFound(err) == false {
t.Error("TestCrud_GRPC_FindMassBy_FieldNamesWithUnderline() error: ", err)
}
}

2
bin/templates/pkg/network/grpc/grpc_client/grpc_client_table_findmassby_test.go_
View File

@ -4,8 +4,8 @@ import (
"github.com/ManyakRus/starter/config_main"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/object_model/entities/lawsuit_status_types"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/network/grpc/grpc_client"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/network/grpc/grpc_client_func"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/network/grpc/grpc_client/grpc_lawsuit_status_types"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/db/crud_func"
"testing"
)

19
internal/config/config.go
View File

@ -128,6 +128,10 @@ type SettingsINI struct {
TEMPLATES_GRPC_CLIENT_TABLES_FINDMASSBY_TEST_FILENAME string
TEMPLATES_GRPC_CLIENT_TABLES_FINDMASSBY_FUNCTION_FILENAME string
TEMPLATES_GRPC_CLIENT_TABLES_FINDMASSBY_FUNCTION_TEST_FILENAME string
TEMPLATES_CRUD_FUNC_FOLDERNAME string
TEMPLATES_CRUD_FUNC_FILENAME string
TEMPLATES_CRUD_FUNC_TEST_FILENAME string
}
func Getenv(Name string, IsRequired bool) string {
@ -719,6 +723,21 @@ func FillSettings() {
s = Getenv(Name, true)
Settings.TEMPLATES_GRPC_CLIENT_TABLES_FINDMASSBY_FUNCTION_TEST_FILENAME = s
//
Name = "TEMPLATES_CRUD_FUNC_FOLDERNAME"
s = Getenv(Name, true)
Settings.TEMPLATES_CRUD_FUNC_FOLDERNAME = s
//
Name = "TEMPLATES_CRUD_FUNC_FILENAME"
s = Getenv(Name, true)
Settings.TEMPLATES_CRUD_FUNC_FILENAME = s
//
Name = "TEMPLATES_CRUD_FUNC_TEST_FILENAME"
s = Getenv(Name, true)
Settings.TEMPLATES_CRUD_FUNC_TEST_FILENAME = s
}
// CurrentDirectory - возвращает текущую директорию ОС

9
internal/create_files/create_files.go
View File

@ -774,6 +774,15 @@ func FindModelTableURL(TableName string) string {
return Otvet
}
// FindCrudFuncURL - возвращает URL репозитория crud_func
func FindCrudFuncURL(string) string {
Otvet := ""
Otvet = config.Settings.SERVICE_REPOSITORY_URL + "/" + config.Settings.TEMPLATES_CRUD_FUNC_FOLDERNAME
return Otvet
}
// FindGRPCClientTableURL - возвращает URL репозитория grpc_client для таблицы TableName
func FindGRPCClientTableURL(TableName string) string {
Otvet := ""

29
internal/create_files/crud/crud.go Normal file
View File

@ -0,0 +1,29 @@
package crud
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/starter/log"
)
// CreateAllFiles - создаёт все файлы в папке grpc proto
func CreateAllFiles() error {
var err error
if config.Settings.NEED_CREATE_GRPC == false {
return err
}
err = CreateCrud()
if err != nil {
log.Error("CreateCrud() error: ", err)
return err
}
err = CreateCrudTest()
if err != nil {
log.Error("CreateCrudTest() error: ", err)
return err
}
return err
}

126
internal/create_files/crud/crud_functions.go Normal file
View File

@ -0,0 +1,126 @@
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"
"os"
"strings"
)
// CreateCrud - создаёт 1 файл в папке grpc_client
func CreateCrud() error {
var err error
//чтение файлов
DirBin := micro.ProgramDir_bin()
DirTemplates := DirBin + config.Settings.TEMPLATE_FOLDERNAME + micro.SeparatorFile()
DirReady := DirBin + config.Settings.READY_FOLDERNAME + micro.SeparatorFile()
DirTemplatesCrud := DirTemplates + config.Settings.TEMPLATES_CRUD_FUNC_FOLDERNAME + micro.SeparatorFile()
DirReadyCrud := DirReady + config.Settings.TEMPLATES_CRUD_FUNC_FOLDERNAME + micro.SeparatorFile()
FilenameReadyCrud := DirReadyCrud + create_files.DeleteLastUnderline(config.Settings.TEMPLATES_CRUD_FUNC_TEST_FILENAME)
FilenameTemplateCrud := DirTemplatesCrud + config.Settings.TEMPLATES_CRUD_FUNC_TEST_FILENAME
//создадим папку готовых файлов
folders.CreateFolder(DirReadyCrud)
bytes, err := os.ReadFile(FilenameTemplateCrud)
if err != nil {
log.Panic("ReadFile() ", FilenameTemplateCrud, " error: ", err)
}
TextCrud := string(bytes)
//заменим имя пакета на новое
TextCrud = create_files.ReplacePackageName(TextCrud, DirReadyCrud)
//добавим импорты
if config.Settings.USE_DEFAULT_TEMPLATE == true {
TextCrud = create_files.DeleteTemplateRepositoryImports(TextCrud)
//constants db
DBConstantsURL := create_files.FindDBConstantsURL()
TextCrud = create_files.AddImport(TextCrud, DBConstantsURL)
}
//добавим импорт uuid
TextCrud = create_files.CheckAndAddImportUUID_FromText(TextCrud)
//заменим имя сервиса на новое
ServiceNameTemplate := config.Settings.TEMPLATE_SERVICE_NAME
ServiceName := config.Settings.SERVICE_NAME
TextCrud = strings.ReplaceAll(TextCrud, ServiceNameTemplate, ServiceName)
TextCrud = strings.ReplaceAll(TextCrud, micro.StringFromUpperCase(ServiceNameTemplate), micro.StringFromUpperCase(ServiceName))
//заменим имя сервиса на новое с CamelCase
ServiceNameTemplate = create_files.FormatName(ServiceNameTemplate)
ServiceName = create_files.FormatName(ServiceName)
TextCrud = strings.ReplaceAll(TextCrud, ServiceNameTemplate, ServiceName)
TextCrud = strings.ReplaceAll(TextCrud, micro.StringFromUpperCase(ServiceNameTemplate), micro.StringFromUpperCase(ServiceName))
//удаление пустого импорта
TextCrud = create_files.DeleteEmptyImport(TextCrud)
//запись файла
err = os.WriteFile(FilenameReadyCrud, []byte(TextCrud), constants.FILE_PERMISSIONS)
return err
}
// CreateCrudTest - создаёт 1 файл в папке grpc_client
func CreateCrudTest() error {
var err error
//чтение файлов
DirBin := micro.ProgramDir_bin()
DirTemplates := DirBin + config.Settings.TEMPLATE_FOLDERNAME + micro.SeparatorFile()
DirReady := DirBin + config.Settings.READY_FOLDERNAME + micro.SeparatorFile()
DirTemplatesCrud := DirTemplates + config.Settings.TEMPLATES_CRUD_FUNC_FOLDERNAME + micro.SeparatorFile()
DirReadyCrud := DirReady + config.Settings.TEMPLATES_CRUD_FUNC_FOLDERNAME + micro.SeparatorFile()
FilenameReadyCrud := DirReadyCrud + create_files.DeleteLastUnderline(config.Settings.TEMPLATES_CRUD_FUNC_TEST_FILENAME)
FilenameTemplateCrud := DirTemplatesCrud + config.Settings.TEMPLATES_CRUD_FUNC_TEST_FILENAME
//создадим папку готовых файлов
folders.CreateFolder(DirReadyCrud)
bytes, err := os.ReadFile(FilenameTemplateCrud)
if err != nil {
log.Panic("ReadFile() ", FilenameTemplateCrud, " error: ", err)
}
TextCrud := string(bytes)
//заменим имя пакета на новое
TextCrud = create_files.ReplacePackageName(TextCrud, DirReadyCrud)
//добавим импорты
if config.Settings.USE_DEFAULT_TEMPLATE == true {
TextCrud = create_files.DeleteTemplateRepositoryImports(TextCrud)
DBConstantsURL := create_files.FindDBConstantsURL()
TextCrud = create_files.AddImport(TextCrud, DBConstantsURL)
}
//заменим имя сервиса на новое
ServiceNameTemplate := config.Settings.TEMPLATE_SERVICE_NAME
ServiceName := config.Settings.SERVICE_NAME
TextCrud = strings.ReplaceAll(TextCrud, ServiceNameTemplate, ServiceName)
TextCrud = strings.ReplaceAll(TextCrud, micro.StringFromUpperCase(ServiceNameTemplate), micro.StringFromUpperCase(ServiceName))
//заменим имя сервиса на новое с CamelCase
ServiceNameTemplate = create_files.FormatName(ServiceNameTemplate)
ServiceName = create_files.FormatName(ServiceName)
TextCrud = strings.ReplaceAll(TextCrud, ServiceNameTemplate, ServiceName)
TextCrud = strings.ReplaceAll(TextCrud, micro.StringFromUpperCase(ServiceNameTemplate), micro.StringFromUpperCase(ServiceName))
//удаление пустого импорта
TextCrud = create_files.DeleteEmptyImport(TextCrud)
//запись файла
err = os.WriteFile(FilenameReadyCrud, []byte(TextCrud), constants.FILE_PERMISSIONS)
return err
}

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

@ -205,6 +205,9 @@ func CreateFilesFindByTest(Table1 *types.Table) error {
ModelTableURL := create_files.FindModelTableURL(TableName)
TextCrud = create_files.AddImport(TextCrud, ModelTableURL)
CrudFuncURL := create_files.FindCrudFuncURL(TableName)
TextCrud = create_files.AddImport(TextCrud, CrudFuncURL)
}
//создание функций

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

@ -211,6 +211,9 @@ func CreateFilesFindMassByTest(Table1 *types.Table) error {
ModelTableURL := create_files.FindModelTableURL(TableName)
TextCrud = create_files.AddImport(TextCrud, ModelTableURL)
CrudFuncURL := create_files.FindCrudFuncURL(TableName)
TextCrud = create_files.AddImport(TextCrud, CrudFuncURL)
}
//создание функций

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

@ -68,17 +68,11 @@ func CreateGRPCClient() error {
RepositoryGRPCConstantsURL := create_files.FindGRPCConstantsURL()
TextGRPCClient = create_files.AddImport(TextGRPCClient, RepositoryGRPCConstantsURL)
//заменим имя сервиса на новое
ServiceNameTemplate := config.Settings.TEMPLATE_SERVICE_NAME
ServiceName := config.Settings.SERVICE_NAME
TextGRPCClient = strings.ReplaceAll(TextGRPCClient, ServiceNameTemplate, ServiceName)
TextGRPCClient = strings.ReplaceAll(TextGRPCClient, strings.ToUpper(ServiceNameTemplate), strings.ToUpper(ServiceName))
//добавим импорт uuid
TextGRPCClient = create_files.CheckAndAddImportUUID_FromText(TextGRPCClient)
}
//добавим импорт uuid
TextGRPCClient = create_files.CheckAndAddImportUUID_FromText(TextGRPCClient)
//заменим имя сервиса на новое
ServiceNameTemplate := config.Settings.TEMPLATE_SERVICE_NAME
ServiceName := config.Settings.SERVICE_NAME

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

@ -231,14 +231,18 @@ func CreateFilesFindByTest(Table1 *types.Table) error {
ModelTableURL := create_files.FindModelTableURL(TableName)
TextGRPCClient = create_files.AddImport(TextGRPCClient, ModelTableURL)
GRPCClient_func_URL := create_files.Find_GRPCClient_func_URL()
TextGRPCClient = create_files.AddImport(TextGRPCClient, GRPCClient_func_URL)
//GRPCClient_func_URL := create_files.Find_GRPCClient_func_URL()
//TextGRPCClient = create_files.AddImport(TextGRPCClient, GRPCClient_func_URL)
GRPClientURL := create_files.FindGRPClientURL()
TextGRPCClient = create_files.AddImport(TextGRPCClient, GRPClientURL)
GRPClientTableURL := create_files.FindGRPCClientTableURL(Table1.Name)
TextGRPCClient = create_files.AddImport(TextGRPCClient, GRPClientTableURL)
CrudFuncURL := create_files.FindCrudFuncURL(TableName)
TextGRPCClient = create_files.AddImport(TextGRPCClient, CrudFuncURL)
}
//создание функций

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

@ -230,14 +230,17 @@ func CreateFilesFindMassByTest(Table1 *types.Table) error {
ModelTableURL := create_files.FindModelTableURL(TableName)
TextGRPCClient = create_files.AddImport(TextGRPCClient, ModelTableURL)
GRPCClient_func_URL := create_files.Find_GRPCClient_func_URL()
TextGRPCClient = create_files.AddImport(TextGRPCClient, GRPCClient_func_URL)
//GRPCClient_func_URL := create_files.Find_GRPCClient_func_URL()
//TextGRPCClient = create_files.AddImport(TextGRPCClient, GRPCClient_func_URL)
GRPClientURL := create_files.FindGRPClientURL()
TextGRPCClient = create_files.AddImport(TextGRPCClient, GRPClientURL)
GRPClientTableURL := create_files.FindGRPCClientTableURL(Table1.Name)
TextGRPCClient = create_files.AddImport(TextGRPCClient, GRPClientTableURL)
CrudFuncURL := create_files.FindCrudFuncURL(TableName)
TextGRPCClient = create_files.AddImport(TextGRPCClient, CrudFuncURL)
}
//создание функций

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

@ -147,9 +147,6 @@ func CreateFilesTest(Table1 *types.Table) error {
ConstantsURL := create_files.FindConstantsURL()
TextGRPCServer = create_files.AddImport(TextGRPCServer, ConstantsURL)
GRPClientTableURL := create_files.FindGRPCClientTableURL(Table1.Name)
TextGRPCServer = create_files.AddImport(TextGRPCServer, GRPClientTableURL)
TextGRPCServer = create_files.CheckAndAddImport(TextGRPCServer, "encoding/json")
//замена "postgres_gorm.Connect_WithApplicationName("

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

@ -229,6 +229,9 @@ func CreateFilesFindByTest(Table1 *types.Table) error {
ProtoURL := create_files.FindProtoURL()
TextGRPCServer = create_files.AddImport(TextGRPCServer, ProtoURL)
CrudFuncURL := create_files.FindCrudFuncURL(TableName)
TextGRPCServer = create_files.AddImport(TextGRPCServer, CrudFuncURL)
}
//создание функций

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

@ -229,6 +229,9 @@ func CreateFilesFindMassByTest(Table1 *types.Table) error {
ProtoURL := create_files.FindProtoURL()
TextGRPCServer = create_files.AddImport(TextGRPCServer, ProtoURL)
CrudFuncURL := create_files.FindCrudFuncURL(TableName)
TextGRPCServer = create_files.AddImport(TextGRPCServer, CrudFuncURL)
}
//создание функций

8
internal/logic/logic.go
View File

@ -5,6 +5,7 @@ import (
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/create_files/alias"
"github.com/ManyakRus/crud_generator/internal/create_files/constants_file"
"github.com/ManyakRus/crud_generator/internal/create_files/crud"
"github.com/ManyakRus/crud_generator/internal/create_files/crud_starter"
"github.com/ManyakRus/crud_generator/internal/create_files/crud_starter_tables"
"github.com/ManyakRus/crud_generator/internal/create_files/crud_tables"
@ -218,5 +219,12 @@ func StartFillAll() error {
return err
}
//crud
err = crud.CreateAllFiles()
if err != nil {
//log.Error("env_file.CreateAllFiles() error: ", err)
return err
}
return err
}