go/crud_generator
1
0
Fork 0
mirror of https://github.com/ManyakRus/crud_generator.git synced 2024-11-27 08:40:53 +02:00
Code Issues Releases Activity

сделал constants_

Browse Source
This commit is contained in:
Nikitin Aleksandr 2024-05-03 15:57:49 +03:00
parent eefff94461
commit e9ad0c5258
21 changed files with 168 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -243,3 +243,9 @@ TEMPLATES_README_MD_FILENAME="README.md_"
#TEMPLATES_README_RUS_FILENAME - short filename of "readme.rus_" file
TEMPLATES_README_RUS_FILENAME="readme.rus_"
#TEMPLATE_FOLDERNAME_CONSTANTS - folder name for service constants
TEMPLATE_FOLDERNAME_CONSTANTS="pkg/constants"
#TEMPLATES_CONSTANTS_FILENAME - short filename of "constants.go_" file
TEMPLATES_CONSTANTS_FILENAME="constants.go_"

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

@ -6,12 +6,16 @@ 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/lawsuit_status_types"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/constants"
"github.com/ManyakRus/starter/postgres_gorm"
"testing"
)
func Test_server_LawsuitStatusType_ReadFromCache(t *testing.T) {
config_main.LoadEnv()
crud_starter.InitCrudTransport_DB()
postgres_gorm.Connect_WithApplicationName(constants.SERVICE_NAME + "_test")
defer postgres_gorm.CloseConnection()
ctx := context.Background()
Request := grpc_proto.RequestId{}

2
bin/templates/internal/app/grpc/server_grpc/server_grpc_table_update_func_test.go_
View File

@ -1,6 +1,8 @@
func Test_server_LawsuitStatusType_Update(t *testing.T) {
config_main.LoadEnv()
crud_starter.InitCrudTransport_DB()
postgres_gorm.Connect_WithApplicationName(constants.SERVICE_NAME + "_test")
defer postgres_gorm.CloseConnection()
server1 := &ServerGRPC{}
ctx := context.Background()

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

@ -6,12 +6,17 @@ 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/lawsuit_status_types"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/constants"
"github.com/ManyakRus/starter/postgres_gorm"
"testing"
)
func TestServerGRPC_LawsuitStatusType_UpdateManyFields(t *testing.T) {
config_main.LoadEnv()
crud_starter.InitCrudTransport_DB()
postgres_gorm.Connect_WithApplicationName(constants.SERVICE_NAME + "_test")
defer postgres_gorm.CloseConnection()
var err error
//прочитаем из БД

12
bin/templates/internal/app/grpc/server_grpc/server_grpc_test.go_
View File

@ -6,6 +6,8 @@ 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/lawsuit_status_types"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/constants"
"github.com/ManyakRus/starter/postgres_gorm"
"testing"
)
@ -15,6 +17,8 @@ const LawsuitStatusType_ID_Test = 0
func Test_server_LawsuitStatusType_Read(t *testing.T) {
config_main.LoadEnv()
crud_starter.InitCrudTransport_DB()
postgres_gorm.Connect_WithApplicationName(constants.SERVICE_NAME + "_test")
defer postgres_gorm.CloseConnection()
ctx := context.Background()
Request := grpc_proto.RequestId{}
@ -34,6 +38,8 @@ func Test_server_LawsuitStatusType_Read(t *testing.T) {
func Test_server_LawsuitStatusType_Delete(t *testing.T) {
config_main.LoadEnv()
crud_starter.InitCrudTransport_DB()
postgres_gorm.Connect_WithApplicationName(constants.SERVICE_NAME + "_test")
defer postgres_gorm.CloseConnection()
ctx := context.Background()
Request := grpc_proto.RequestId{}
@ -101,6 +107,8 @@ func Test_server_LawsuitStatusType_Delete(t *testing.T) {
func Test_server_LawsuitStatusType_Create(t *testing.T) {
config_main.LoadEnv()
crud_starter.InitCrudTransport_DB()
postgres_gorm.Connect_WithApplicationName(constants.SERVICE_NAME + "_test")
defer postgres_gorm.CloseConnection()
var ModelString string
m := lawsuit_status_types.LawsuitStatusType{}
@ -129,6 +137,8 @@ func Test_server_LawsuitStatusType_Create(t *testing.T) {
func Test_server_LawsuitStatusType_Update(t *testing.T) {
config_main.LoadEnv()
crud_starter.InitCrudTransport_DB()
postgres_gorm.Connect_WithApplicationName(constants.SERVICE_NAME + "_test")
defer postgres_gorm.CloseConnection()
ctx := context.Background()
Request := grpc_proto.RequestId{}
@ -165,6 +175,8 @@ func Test_server_LawsuitStatusType_Update(t *testing.T) {
func Test_server_LawsuitStatusType_Save(t *testing.T) {
config_main.LoadEnv()
crud_starter.InitCrudTransport_DB()
postgres_gorm.Connect_WithApplicationName(constants.SERVICE_NAME + "_test")
defer postgres_gorm.CloseConnection()
ctx := context.Background()
Request := grpc_proto.RequestId{}

3
bin/templates/pkg/constants/constants.go_ Normal file
View File

@ -0,0 +1,3 @@
package constants
const SERVICE_NAME = "sync_service"

3
bin/templates/pkg/db/crud/crud_table_cache_test.go_
View File

@ -3,6 +3,7 @@ package crud_lawsuit_status_types
import (
"github.com/ManyakRus/starter/config_main"
"github.com/ManyakRus/starter/postgres_gorm"
"gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/constants"
"reflect"
"testing"
)
@ -11,7 +12,7 @@ func TestReadFromCache(t *testing.T) {
var err error
config_main.LoadEnv()
postgres_gorm.Connect()
postgres_gorm.Connect_WithApplicationName(constants.SERVICE_NAME + "_test")
defer postgres_gorm.CloseConnection()
//читаем из БД

2
bin/templates/pkg/db/crud/crud_table_update_func_test.go_
View File

@ -1,7 +1,7 @@
func TestUpdate(t *testing.T) {
config_main.LoadEnv()
postgres_gorm.Connect()
postgres_gorm.Connect_WithApplicationName(constants.SERVICE_NAME + "_test")
defer postgres_gorm.CloseConnection()
//прочитаем из БД

3
bin/templates/pkg/db/crud/crud_table_update_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/constants"
"testing"
)
@ -11,7 +12,7 @@ import (
func TestUpdateManyFields(t *testing.T) {
config_main.LoadEnv()
postgres_gorm.Connect()
postgres_gorm.Connect_WithApplicationName(constants.SERVICE_NAME + "_test")
defer postgres_gorm.CloseConnection()
//прочитаем из БД

9
bin/templates/pkg/db/crud/crud_tables_rapira_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/constants"
"testing"
)
@ -12,7 +13,7 @@ const Postgres_ID_Test = 0
func TestRead(t *testing.T) {
config_main.LoadEnv()
postgres_gorm.Connect()
postgres_gorm.Connect_WithApplicationName(constants.SERVICE_NAME + "_test")
defer postgres_gorm.CloseConnection()
crud := Crud_DB{}
@ -33,7 +34,7 @@ func TestRead(t *testing.T) {
func TestSave(t *testing.T) {
config_main.LoadEnv()
postgres_gorm.Connect()
postgres_gorm.Connect_WithApplicationName(constants.SERVICE_NAME + "_test")
defer postgres_gorm.CloseConnection()
crud := Crud_DB{}
@ -59,7 +60,7 @@ func TestSave(t *testing.T) {
func TestDelete(t *testing.T) {
config_main.LoadEnv()
postgres_gorm.Connect()
postgres_gorm.Connect_WithApplicationName(constants.SERVICE_NAME + "_test")
defer postgres_gorm.CloseConnection()
crud := Crud_DB{}
@ -97,7 +98,7 @@ func TestDelete(t *testing.T) {
func TestFind_ByExtID(t *testing.T) {
config_main.LoadEnv()
postgres_gorm.Connect()
postgres_gorm.Connect_WithApplicationName(constants.SERVICE_NAME + "_test")
defer postgres_gorm.CloseConnection()
crud := Crud_DB{}

9
bin/templates/pkg/db/crud/crud_tables_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/constants"
"testing"
)
@ -12,7 +13,7 @@ const Postgres_ID_Test = 0
func TestRead(t *testing.T) {
config_main.LoadEnv()
postgres_gorm.Connect()
postgres_gorm.Connect_WithApplicationName(constants.SERVICE_NAME + "_test")
defer postgres_gorm.CloseConnection()
crud := Crud_DB{}
@ -33,7 +34,7 @@ func TestRead(t *testing.T) {
func TestSave(t *testing.T) {
config_main.LoadEnv()
postgres_gorm.Connect()
postgres_gorm.Connect_WithApplicationName(constants.SERVICE_NAME + "_test")
defer postgres_gorm.CloseConnection()
crud := Crud_DB{}
@ -59,7 +60,7 @@ func TestSave(t *testing.T) {
func TestDelete(t *testing.T) {
config.LoadEnv()
postgres_gorm.Connect()
postgres_gorm.Connect_WithApplicationName(constants.SERVICE_NAME + "_test")
defer postgres_gorm.CloseConnection()
crud := Crud_DB{}
@ -74,7 +75,7 @@ func TestDelete(t *testing.T) {
func TestFind_ByExtID(t *testing.T) {
config_main.LoadEnv()
postgres_gorm.Connect()
postgres_gorm.Connect_WithApplicationName(constants.SERVICE_NAME + "_test")
defer postgres_gorm.CloseConnection()
crud := Crud_DB{}

0
bin/templates/pkg/db/constants/constants.go → bin/templates/pkg/db/db_constants/constants.go
View File

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

@ -1,7 +1,7 @@
func TestCrud_GRPC_Update(t *testing.T) {
config_main.LoadEnv()
grpc_client.Connect()
postgres_gorm.Connect_WithApplicationName(constants.SERVICE_NAME + "_test")
defer grpc_client.CloseConnection()
crud := Crud_GRPC{}

12
internal/config/config.go
View File

@ -56,6 +56,8 @@ type SettingsINI struct {
TEMPLATES_GRPC_CLIENT_TABLES_CACHE_TEST_FILENAME string
TEMPLATES_README_MD_FILENAME string
TEMPLATES_README_RUS_FILENAME string
TEMPLATE_FOLDERNAME_CONSTANTS string
TEMPLATES_CONSTANTS_FILENAME string
NEED_CREATE_MODEL_STRUCT bool
NEED_CREATE_MODEL_CRUD bool
NEED_CREATE_DB bool
@ -502,6 +504,16 @@ func FillSettings() {
s = Getenv(Name, true)
Settings.TEMPLATES_README_RUS_FILENAME = s
//
Name = "TEMPLATE_FOLDERNAME_CONSTANTS"
s = Getenv(Name, true)
Settings.TEMPLATE_FOLDERNAME_CONSTANTS = s
//
Name = "TEMPLATES_CONSTANTS_FILENAME"
s = Getenv(Name, true)
Settings.TEMPLATES_CONSTANTS_FILENAME = s
}
// CurrentDirectory - возвращает текущую директорию ОС

59
internal/create_files/constants_file/constants_file.go Normal file
View File

@ -0,0 +1,59 @@
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"
"os"
"strings"
)
// CreateAllFiles - создаёт все файлы в папке grpc proto
func CreateAllFiles() error {
var err error
err = CreateFileConstants()
if err != nil {
log.Error("CreateFileConstants() error: ", err)
return err
}
return err
}
// CreateFileConstants - создаёт 1 файл в папке constants
func CreateFileConstants() error {
var err error
//чтение файлов
DirBin := micro.ProgramDir_bin()
DirTemplates := DirBin + config.Settings.TEMPLATE_FOLDERNAME + micro.SeparatorFile()
DirReady := DirBin + config.Settings.READY_FOLDERNAME + micro.SeparatorFile()
DirTemplatesConstants := DirTemplates + config.Settings.TEMPLATE_FOLDERNAME_CONSTANTS + micro.SeparatorFile()
DirReadyConstants := DirReady + config.Settings.TEMPLATE_FOLDERNAME_CONSTANTS + micro.SeparatorFile()
FilenameReadyConstants := DirReadyConstants + config.Settings.TEMPLATES_CONSTANTS_FILENAME
FilenameReadyConstants = create_files.DeleteLastUnderline(FilenameReadyConstants)
//создадим папку готовых файлов
folders.CreateFolder(DirReadyConstants)
FilenameTemplateConstants := DirTemplatesConstants + config.Settings.TEMPLATES_CONSTANTS_FILENAME
bytes, err := os.ReadFile(FilenameTemplateConstants)
if err != nil {
log.Panic("ReadFile() ", FilenameTemplateConstants, " error: ", err)
}
TextConstants := string(bytes)
//заменим название сервиса
ServiceNameTemplate := config.Settings.TEMPLATE_SERVICE_NAME
ServiceNameNew := config.Settings.SERVICE_NAME
TextConstants = strings.ReplaceAll(TextConstants, ServiceNameTemplate, ServiceNameNew)
//запись файла
err = os.WriteFile(FilenameReadyConstants, []byte(TextConstants), constants.FILE_PERMISSIONS)
return err
}

1
internal/create_files/constants_file/constants_file_test.go Normal file
View File

@ -0,0 +1 @@
package constants_file

13
internal/create_files/create_files.go
View File

@ -492,11 +492,20 @@ func FindNRPC_Client_URL() string {
return Otvet
}
// FindDBConstantsURL - возвращает URL репозитория с пакетом db "constants"
// FindDBConstantsURL - возвращает URL репозитория с пакетом db "db_constants"
func FindDBConstantsURL() string {
Otvet := ""
Otvet = config.Settings.SERVICE_REPOSITORY_URL + "/" + config.Settings.TEMPLATE_FOLDERNAME_DB + "/" + "constants"
Otvet = config.Settings.SERVICE_REPOSITORY_URL + "/" + config.Settings.TEMPLATE_FOLDERNAME_DB + "/" + "db_constants"
return Otvet
}
// FindConstantsURL - возвращает URL репозитория с пакетом pkg "constants"
func FindConstantsURL() string {
Otvet := ""
Otvet = config.Settings.SERVICE_REPOSITORY_URL + "/" + config.Settings.TEMPLATE_FOLDERNAME_CONSTANTS
return Otvet
}

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

@ -223,6 +223,9 @@ func CreateFilesTest(Table1 *types.Table) error {
ModelTableURL := create_files.FindModelTableURL(TableName)
TextDB = create_files.AddImport(TextDB, ModelTableURL)
ConstantsURL := create_files.FindConstantsURL()
TextDB = create_files.AddImport(TextDB, ConstantsURL)
//удалим лишние функции
TextDB = create_files.DeleteFuncTestDelete(TextDB, Table1)
TextDB = create_files.DeleteFuncTestRestore(TextDB, Table1)
@ -719,6 +722,10 @@ func CreateFilesUpdateEveryColumnTest(Table1 *types.Table) error {
TextCrud = create_files.ReplacePrimaryKeyM_ID(TextCrud, Table1)
TextCrud = create_files.ReplacePrimaryKeyOtvetID(TextCrud, Table1)
//TextCrud = create_files.ConvertRequestIdToAlias(TextCrud, Table1)
ConstantsURL := create_files.FindConstantsURL()
TextCrud = create_files.AddImport(TextCrud, ConstantsURL)
}
//создание текста
@ -923,6 +930,9 @@ func CreateFilesCacheTest(Table1 *types.Table) error {
//TextCache = create_files.AddImport(TextCache, ModelTableURL)
//TextCache = create_files.ConvertRequestIdToAlias(TextCache, Table1)
ConstantsURL := create_files.FindConstantsURL()
TextCache = create_files.AddImport(TextCache, ConstantsURL)
}
//замена слов

9
internal/create_files/server_grpc_tables/server_grpc_tables.go
View File

@ -211,6 +211,9 @@ func CreateFilesTest(Table1 *types.Table) error {
CrudStarterURL := create_files.FindCrudStarterURL()
TextGRPCServer = create_files.AddImport(TextGRPCServer, CrudStarterURL)
ConstantsURL := create_files.FindConstantsURL()
TextGRPCServer = create_files.AddImport(TextGRPCServer, ConstantsURL)
TextGRPCServer = create_files.CheckAndAddImport(TextGRPCServer, "encoding/json")
//Postgres_ID_Test = ID Minimum
@ -584,6 +587,9 @@ func CreateFilesUpdateEveryColumnTest(Table1 *types.Table) error {
CrudStarterURL := create_files.FindCrudStarterURL()
TextGRPCServer = create_files.AddImport(TextGRPCServer, CrudStarterURL)
ConstantsURL := create_files.FindConstantsURL()
TextGRPCServer = create_files.AddImport(TextGRPCServer, ConstantsURL)
//TextGRPCServer = create_files.ConvertRequestIdToAlias(TextGRPCServer, Table1)
}
@ -797,6 +803,9 @@ func CreateFilesCacheTest(Table1 *types.Table) error {
CrudStarterURL := create_files.FindCrudStarterURL()
TextGRPCServer = create_files.AddImport(TextGRPCServer, CrudStarterURL)
ConstantsURL := create_files.FindConstantsURL()
TextGRPCServer = create_files.AddImport(TextGRPCServer, ConstantsURL)
//замена RequestId{}
TextGRPCServer = create_files.ReplaceTextRequestID_PrimaryKey(TextGRPCServer, Table1)

8
internal/logic/logic.go
View File

@ -3,6 +3,7 @@ package logic
import (
"github.com/ManyakRus/crud_generator/internal/config"
"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_starter"
"github.com/ManyakRus/crud_generator/internal/create_files/crud_starter_tables"
"github.com/ManyakRus/crud_generator/internal/create_files/crud_tables"
@ -192,5 +193,12 @@ func StartFillAll() error {
return err
}
//constants
err = constants_file.CreateAllFiles()
if err != nil {
//log.Error("env_file.CreateAllFiles() error: ", err)
return err
}
return err
}

16
internal/postgres/postgres.go
View File

@ -7,7 +7,6 @@ import (
"fmt"
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/mini_func"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/crud_generator/pkg/dbmeta"
"github.com/ManyakRus/starter/contextmain"
@ -407,11 +406,16 @@ func FillIDMinimum(MapTable map[string]*types.Table) error {
}
//
if TypeGo == "string" {
Table1.IDMinimum = `"` + IDMinimum.String + `"`
} else if mini_func.IsNumberType(TypeGo) == true {
Table1.IDMinimum = IDMinimum.String
}
Table1.IDMinimum = IDMinimum.String
//if TypeGo == "string" || TypeGo == "uuid.UUID" {
// Table1.IDMinimum = IDMinimum.String
//} else if mini_func.IsNumberType(TypeGo) == true {
// Table1.IDMinimum = IDMinimum.String
//} else if TypeGo == "time.Time" {
// Table1.IDMinimum = IDMinimum.String
//} else {
// Table1.IDMinimum = IDMinimum.String
//}
}
return err