From ffc35040819c6e2fbdbe96eb3d289fbafee72cea Mon Sep 17 00:00:00 2001 From: Nikitin Aleksandr Date: Tue, 5 Nov 2024 11:16:42 +0300 Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20objects?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/templates/configs_/settings.txt | 28 +++++++-------- internal/config/config.go | 36 +++++++++---------- internal/create_files/create_files.go | 4 +-- .../crud_object_tables_crud.go | 22 ++++++------ .../object_tables/object_tables_crud.go | 10 +++--- internal/logic/logic.go | 2 +- 6 files changed, 51 insertions(+), 51 deletions(-) diff --git a/bin/templates/configs_/settings.txt b/bin/templates/configs_/settings.txt index 60660e3..df518ca 100644 --- a/bin/templates/configs_/settings.txt +++ b/bin/templates/configs_/settings.txt @@ -540,24 +540,24 @@ TEMPLATES_GRPC_CLIENT_TABLES_FINDMODELBY_FUNCTION_FILENAME="grpc_client_table_fi TEMPLATES_GRPC_CLIENT_TABLES_FINDMODELBY_FUNCTION_TEST_FILENAME="grpc_client_table_findmodelby_function_test.go_" -#-------------------------------------------OBJECTS-------------------------------------------- -#NEED_CREATE_OBJECTS - need create files for objects (entity + foreign columns) -NEED_CREATE_OBJECTS=true +#-------------------------------------------READOBJECT-------------------------------------------- +#NEED_CREATE_READOBJECT - need create files for objects (entity + foreign columns) +NEED_CREATE_READOBJECT=true -#PREFIX_OBJECT - prefix for "object_" files -PREFIX_OBJECT="object_" +#PREFIX_READOBJECT - prefix for "object_" files +PREFIX_READOBJECT="object_" -#PREFIX_CRUD_OBJECT - prefix for "crud_object_" files -PREFIX_CRUD_OBJECT="crud_object_" +#PREFIX_CRUD_READOBJECT - prefix for "crud_object_" files +PREFIX_CRUD_READOBJECT="crud_object_" -#TEMPLATES_OBJECTS_FOLDERNAME - folder name for "pkg/objects" files -TEMPLATES_OBJECTS_FOLDERNAME="pkg/object_model/objects" +#TEMPLATES_READOBJECT_FOLDERNAME - folder name for "pkg/objects" files +TEMPLATES_READOBJECT_FOLDERNAME="pkg/object_model/objects" -#TEMPLATES_OBJECTS_FILENAME - short filename of "objects_table.go_" file -TEMPLATES_OBJECTS_FILENAME="objects_table.go_" +#TEMPLATES_MODEL_READOBJECT_FILENAME - short filename of "objects_table.go_" file +TEMPLATES_MODEL_READOBJECT_FILENAME="objects_table.go_" -#TEMPLATES_CRUD_OBJECTS_FOLDERNAME - folder name "pkg/db/crud_objects" for crud objects -TEMPLATES_CRUD_OBJECTS_FOLDERNAME="pkg/db/crud_objects" +#TEMPLATES_CRUD_READOBJECT_FOLDERNAME - folder name "pkg/db/crud_objects" for crud objects +TEMPLATES_CRUD_READOBJECT_FOLDERNAME="pkg/db/crud_objects" @@ -617,4 +617,4 @@ TEXT_DELETED_COLUMN_RUS="УДАЛИТЬ" #--------------------------------------------------------------------------------------- #TESTS_FOLDERNAME - text "tests", for testing folders -TESTS_FOLDERNAME = "tests" +TESTS_FOLDERNAME = "tests" \ No newline at end of file diff --git a/internal/config/config.go b/internal/config/config.go index 9c6c879..8d9510c 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -221,13 +221,13 @@ type SettingsINI struct { TESTS_FOLDERNAME string //Objects - NEED_CREATE_OBJECTS bool - PREFIX_OBJECT string - PREFIX_CRUD_OBJECT string - TEMPLATES_OBJECTS_FOLDERNAME string - TEMPLATES_MODEL_OBJECTS_FILENAME string + NEED_CREATE_READOBJECT bool + PREFIX_READOBJECT string + PREFIX_CRUD_READOBJECT string + TEMPLATES_READOBJECT_FOLDERNAME string + TEMPLATES_MODEL_READOBJECT_FILENAME string - TEMPLATES_CRUD_OBJECTS_FOLDERNAME string + TEMPLATES_CRUD_READOBJECT_FOLDERNAME string TEMPLATES_CRUD_TABLE_READOBJECT_FILENAME string TEMPLATES_CRUD_TABLE_READOBJECT_TEST_FILENAME string @@ -1173,19 +1173,19 @@ func FillSettings() { Settings.TEMPLATES_NAME_PRIMARYKEYS_FILENAME = s // - Name = "TEMPLATES_OBJECTS_FOLDERNAME" + Name = "TEMPLATES_READOBJECT_FOLDERNAME" s = Getenv(Name, true) - Settings.TEMPLATES_OBJECTS_FOLDERNAME = s + Settings.TEMPLATES_READOBJECT_FOLDERNAME = s // - Name = "TEMPLATES_MODEL_OBJECTS_FILENAME" + Name = "TEMPLATES_MODEL_READOBJECT_FILENAME" s = Getenv(Name, true) - Settings.TEMPLATES_MODEL_OBJECTS_FILENAME = s + Settings.TEMPLATES_MODEL_READOBJECT_FILENAME = s // - Name = "PREFIX_OBJECT" + Name = "PREFIX_READOBJECT" s = Getenv(Name, true) - Settings.PREFIX_OBJECT = s + Settings.PREFIX_READOBJECT = s // Name = "TEXT_DELETED_TABLE" @@ -1208,14 +1208,14 @@ func FillSettings() { Settings.TEXT_DELETED_COLUMN_RUS = s // - Name = "NEED_CREATE_OBJECTS" + Name = "NEED_CREATE_READOBJECT" s = Getenv(Name, true) - Settings.NEED_CREATE_OBJECTS = BoolFromString(s) + Settings.NEED_CREATE_READOBJECT = BoolFromString(s) // - Name = "TEMPLATES_CRUD_OBJECTS_FOLDERNAME" + Name = "TEMPLATES_CRUD_READOBJECT_FOLDERNAME" s = Getenv(Name, true) - Settings.TEMPLATES_CRUD_OBJECTS_FOLDERNAME = s + Settings.TEMPLATES_CRUD_READOBJECT_FOLDERNAME = s // Name = "TEMPLATES_CRUD_TABLE_READOBJECT_FILENAME" @@ -1278,9 +1278,9 @@ func FillSettings() { Settings.TEMPLATES_GRPC_CLIENT_TABLES_READOBJECT_FUNCTION_TEST_FILENAME = s // - Name = "PREFIX_CRUD_OBJECT" + Name = "PREFIX_CRUD_READOBJECT" s = Getenv(Name, true) - Settings.PREFIX_CRUD_OBJECT = s + Settings.PREFIX_CRUD_READOBJECT = s // Name = "TESTS_FOLDERNAME" diff --git a/internal/create_files/create_files.go b/internal/create_files/create_files.go index 496734e..4e1b471 100644 --- a/internal/create_files/create_files.go +++ b/internal/create_files/create_files.go @@ -719,7 +719,7 @@ func Find_ModelTableURL(TableName string) string { func Find_ObjectTableURL(TableName string) string { Otvet := "" - Otvet = config.Settings.SERVICE_REPOSITORY_URL + "/" + config.Settings.TEMPLATES_OBJECTS_FOLDERNAME + "/" + TableName + Otvet = config.Settings.SERVICE_REPOSITORY_URL + "/" + config.Settings.TEMPLATES_READOBJECT_FOLDERNAME + "/" + TableName return Otvet } @@ -728,7 +728,7 @@ func Find_ObjectTableURL(TableName string) string { func Find_CrudObjectTableURL(TableName string) string { Otvet := "" - Otvet = config.Settings.SERVICE_REPOSITORY_URL + "/" + config.Settings.TEMPLATES_CRUD_OBJECTS_FOLDERNAME + "/" + TableName + Otvet = config.Settings.SERVICE_REPOSITORY_URL + "/" + config.Settings.TEMPLATES_CRUD_READOBJECT_FOLDERNAME + "/" + TableName return Otvet } diff --git a/internal/create_files/crud_object_tables/crud_object_tables_crud.go b/internal/create_files/crud_object_tables/crud_object_tables_crud.go index 1675a7d..682c09b 100644 --- a/internal/create_files/crud_object_tables/crud_object_tables_crud.go +++ b/internal/create_files/crud_object_tables/crud_object_tables_crud.go @@ -18,13 +18,13 @@ func CreateFiles_ReadObject(MapAll map[string]*types.Table, Table1 *types.Table) 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_OBJECTS_FOLDERNAME + micro.SeparatorFile() - DirReadyCrud := DirReady + config.Settings.TEMPLATES_CRUD_OBJECTS_FOLDERNAME + micro.SeparatorFile() + DirTemplatesCrud := DirTemplates + config.Settings.TEMPLATES_CRUD_READOBJECT_FOLDERNAME + micro.SeparatorFile() + DirReadyCrud := DirReady + config.Settings.TEMPLATES_CRUD_READOBJECT_FOLDERNAME + micro.SeparatorFile() FilenameTemplateCrud := DirTemplatesCrud + config.Settings.TEMPLATES_CRUD_TABLE_READOBJECT_FILENAME TableName := strings.ToLower(Table1.Name) - DirReadyTable := DirReadyCrud + config.Settings.PREFIX_CRUD_OBJECT + TableName - FilenameReady := DirReadyTable + micro.SeparatorFile() + config.Settings.PREFIX_CRUD_OBJECT + TableName + DirReadyTable := DirReadyCrud + config.Settings.PREFIX_CRUD_READOBJECT + TableName + FilenameReady := DirReadyTable + micro.SeparatorFile() + config.Settings.PREFIX_CRUD_READOBJECT + TableName //создадим каталог create_files.CreateDirectory(DirReadyTable) @@ -37,7 +37,7 @@ func CreateFiles_ReadObject(MapAll map[string]*types.Table, Table1 *types.Table) TextCrud := string(bytes) //загрузим шаблон файла функции - FilenameTemplateCrudFunction := DirTemplatesCrud + config.Settings.TEMPLATES_CRUD_TABLE_READALL_FUNCTION_FILENAME + FilenameTemplateCrudFunction := DirTemplatesCrud + config.Settings.TEMPLATES_CRUD_TABLE_READOBJECT_FUNCTION_FILENAME bytes, err = os.ReadFile(FilenameTemplateCrudFunction) if err != nil { log.Panic("ReadFile() ", FilenameTemplateCrudFunction, " error: ", err) @@ -166,13 +166,13 @@ func CreateFiles_ReadObject_Test(MapAll map[string]*types.Table, Table1 *types.T 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_OBJECTS_FOLDERNAME + micro.SeparatorFile() - DirReadyCrud := DirReady + config.Settings.TEMPLATES_CRUD_OBJECTS_FOLDERNAME + micro.SeparatorFile() + DirTemplatesCrud := DirTemplates + config.Settings.TEMPLATES_CRUD_READOBJECT_FOLDERNAME + micro.SeparatorFile() + DirReadyCrud := DirReady + config.Settings.TEMPLATES_CRUD_READOBJECT_FOLDERNAME + micro.SeparatorFile() - FilenameTemplateCrud := DirTemplatesCrud + config.Settings.TEMPLATES_CRUD_TABLE_READALL_TEST_FILENAME + FilenameTemplateCrud := DirTemplatesCrud + config.Settings.TEMPLATES_CRUD_TABLE_READOBJECT_TEST_FILENAME TableName := strings.ToLower(Table1.Name) - DirReadyTable := DirReadyCrud + config.Settings.PREFIX_CRUD_OBJECT + TableName + micro.SeparatorFile() + config.Settings.TESTS_FOLDERNAME - FilenameReady := DirReadyTable + micro.SeparatorFile() + config.Settings.PREFIX_CRUD_OBJECT + TableName + DirReadyTable := DirReadyCrud + config.Settings.PREFIX_CRUD_READOBJECT + TableName + micro.SeparatorFile() + config.Settings.TESTS_FOLDERNAME + FilenameReady := DirReadyTable + micro.SeparatorFile() + config.Settings.PREFIX_CRUD_READOBJECT + TableName //создадим каталог create_files.CreateDirectory(DirReadyTable) @@ -185,7 +185,7 @@ func CreateFiles_ReadObject_Test(MapAll map[string]*types.Table, Table1 *types.T TextCrud := string(bytes) ////загрузим шаблон файла функции - //FilenameTemplateCrudFunction := DirTemplatesCrud + config.Settings.TEMPLATES_CRUD_TABLE_READALL_FUNCTION_TEST_FILENAME + //FilenameTemplateCrudFunction := DirTemplatesCrud + config.Settings.TEMPLATES_CRUD_TABLE_READOBJECT_FUNCTION_TEST_FILENAME //bytes, err = os.ReadFile(FilenameTemplateCrudFunction) //if err != nil { // log.Panic("ReadFile() ", FilenameTemplateCrudFunction, " error: ", err) diff --git a/internal/create_files/object_tables/object_tables_crud.go b/internal/create_files/object_tables/object_tables_crud.go index 63b00df..9c2ac19 100644 --- a/internal/create_files/object_tables/object_tables_crud.go +++ b/internal/create_files/object_tables/object_tables_crud.go @@ -18,13 +18,13 @@ func CreateFiles(MapAll map[string]*types.Table, Table1 *types.Table) error { DirBin := micro.ProgramDir_bin() DirTemplates := DirBin + config.Settings.TEMPLATE_FOLDERNAME + micro.SeparatorFile() DirReady := DirBin + config.Settings.READY_FOLDERNAME + micro.SeparatorFile() - DirTemplatesObjects := DirTemplates + config.Settings.TEMPLATES_OBJECTS_FOLDERNAME + micro.SeparatorFile() - DirReadyDB := DirReady + config.Settings.TEMPLATES_OBJECTS_FOLDERNAME + micro.SeparatorFile() + DirTemplatesObjects := DirTemplates + config.Settings.TEMPLATES_READOBJECT_FOLDERNAME + micro.SeparatorFile() + DirReadyDB := DirReady + config.Settings.TEMPLATES_READOBJECT_FOLDERNAME + micro.SeparatorFile() - FilenameTemplateObject := DirTemplatesObjects + config.Settings.TEMPLATES_MODEL_OBJECTS_FILENAME + FilenameTemplateObject := DirTemplatesObjects + config.Settings.TEMPLATES_MODEL_READOBJECT_FILENAME TableName := strings.ToLower(Table1.Name) - DirReadyTable := DirReadyDB + config.Settings.PREFIX_OBJECT + TableName - FilenameReadyObjects := DirReadyTable + micro.SeparatorFile() + config.Settings.PREFIX_OBJECT + TableName + ".go" + DirReadyTable := DirReadyDB + config.Settings.PREFIX_READOBJECT + TableName + FilenameReadyObjects := DirReadyTable + micro.SeparatorFile() + config.Settings.PREFIX_READOBJECT + TableName + ".go" //создадим каталог create_files.CreateDirectory(DirReadyTable) diff --git a/internal/logic/logic.go b/internal/logic/logic.go index 1a265b0..d4c3936 100644 --- a/internal/logic/logic.go +++ b/internal/logic/logic.go @@ -234,7 +234,7 @@ func StartFillAll() error { } //objects - if config.Settings.NEED_CREATE_OBJECTS == true { + if config.Settings.NEED_CREATE_READOBJECT == true { err = object_tables.CreateAllFiles(MapAll) if err != nil { //log.Error("env_file.CreateAllFiles() error: ", err)