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

сделал готов notifier_service

Browse Source
This commit is contained in:
Nikitin Aleksandr 2024-05-03 11:23:59 +03:00
parent 709d8a9d7b
commit eefff94461
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,6 +43,6 @@ func UpdateManyFields_ctx(ctx context.Context, db *gorm.DB, m *lawsuit_status_ty
return err return err
} }
err = create_update_ctx(ctx, db, m, false, MassNeedUpdateFields) err = create_update_ctx(ctx, db, m, MassNeedUpdateFields)
return err return err
} }

4
internal/create_files/create_files.go
View File

@ -1443,7 +1443,7 @@ func FindTextProtobufRequest_ID_Type(Table1 *types.Table, Column1 *types.Column,
} }
case "uuid.UUID": case "uuid.UUID":
{ {
if Column1.TypeGo == "string" && PrimaryKeyColumn.TypeGo == "string" { if PrimaryKeyColumn.TypeGo == "string" || PrimaryKeyColumn.TypeGo == "uuid.UUID" {
TextRequestProtoName = "String" TextRequestProtoName = "String"
TextRequestFieldName = "String_2" TextRequestFieldName = "String_2"
TextRequestFieldGolang = VariableName + "String_2" TextRequestFieldGolang = VariableName + "String_2"
@ -1817,6 +1817,7 @@ func Replace_Model_ID_Test(Text string, Table1 *types.Table) string {
if IDMinimum == "" { if IDMinimum == "" {
IDMinimum = FindTextDefaultValue(PrimaryKeyColumn.TypeGo) IDMinimum = FindTextDefaultValue(PrimaryKeyColumn.TypeGo)
} }
DefaultModelName := config.Settings.TEXT_TEMPLATE_MODEL
if PrimaryKeyColumn.TypeGo == "uuid.UUID" { if PrimaryKeyColumn.TypeGo == "uuid.UUID" {
if Table1.IDMinimum == "" { if Table1.IDMinimum == "" {
@ -1824,6 +1825,7 @@ func Replace_Model_ID_Test(Text string, Table1 *types.Table) string {
} else { } else {
Otvet = strings.ReplaceAll(Otvet, TextFind, `var `+ModelName+`_ID_Test, _ = uuid.Parse("`+IDMinimum+`")`) Otvet = strings.ReplaceAll(Otvet, TextFind, `var `+ModelName+`_ID_Test, _ = uuid.Parse("`+IDMinimum+`")`)
} }
Otvet = strings.ReplaceAll(Otvet, ``+DefaultModelName+`_ID_Test`, ``+ModelName+`_ID_Test.String()`)
} else { } else {
Otvet = strings.ReplaceAll(Otvet, TextFind, `const `+ModelName+`_ID_Test = `+IDMinimum) Otvet = strings.ReplaceAll(Otvet, TextFind, `const `+ModelName+`_ID_Test = `+IDMinimum)
} }

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

@ -567,8 +567,6 @@ func CreateFilesUpdateEveryColumnTest(Table1 *types.Table) error {
//заменим имя пакета на новое //заменим имя пакета на новое
TextGRPCServer = create_files.ReplacePackageName(TextGRPCServer, DirReadyTable) TextGRPCServer = create_files.ReplacePackageName(TextGRPCServer, DirReadyTable)
TextGRPCServer = strings.ReplaceAll(TextGRPCServer, config.Settings.TEXT_TEMPLATE_MODEL, Table1.NameGo)
TextGRPCServer = strings.ReplaceAll(TextGRPCServer, config.Settings.TEXT_TEMPLATE_TABLENAME, Table1.Name)
//заменим импорты //заменим импорты
if config.Settings.USE_DEFAULT_TEMPLATE == true { if config.Settings.USE_DEFAULT_TEMPLATE == true {
@ -592,6 +590,12 @@ func CreateFilesUpdateEveryColumnTest(Table1 *types.Table) error {
//создание текста //создание текста
TextUpdateEveryColumn := FindTextUpdateEveryColumnTest(TextGRPCServerUpdateFunc, Table1) TextUpdateEveryColumn := FindTextUpdateEveryColumnTest(TextGRPCServerUpdateFunc, Table1)
//Postgres_ID_Test = ID Minimum
TextGRPCServer = create_files.Replace_Model_ID_Test(TextGRPCServer, Table1)
TextGRPCServer = strings.ReplaceAll(TextGRPCServer, config.Settings.TEXT_TEMPLATE_MODEL, Table1.NameGo)
TextGRPCServer = strings.ReplaceAll(TextGRPCServer, config.Settings.TEXT_TEMPLATE_TABLENAME, Table1.Name)
// пустой файл не нужен // пустой файл не нужен
if TextUpdateEveryColumn == "" { if TextUpdateEveryColumn == "" {
return err return err
@ -661,18 +665,21 @@ func FindTextUpdateEveryColumnTest1(TextGRPCServerUpdateFunc string, Table1 *typ
ColumnName := Column1.NameGo ColumnName := Column1.NameGo
FuncName := "Update_" + ColumnName FuncName := "Update_" + ColumnName
TextRequest2, TextRequestField, TextRequestFieldGolang, _ := create_files.FindTextProtobufRequest_ID_Type(Table1, Column1, "Request2.") TextRequest2, TextRequestField, TextRequestFieldGolang, _ := create_files.FindTextProtobufRequest_ID_Type(Table1, Column1, "Request2.")
TextModelColumnName := create_files.FindTextConvertGolangTypeToProtobufType(Table1, Column1, "Model.") TextModelColumnName := create_files.FindTextConvertGolangTypeToProtobufType(Table1, Column1, "m.")
//Postgres_ID_Test = ID Minimum
Otvet = create_files.Replace_Model_ID_Test(Otvet, Table1)
//if TextGolangLine != "" { //if TextGolangLine != "" {
// Otvet = strings.ReplaceAll(Otvet, "value := Request.FieldName", TextGolangLine) // Otvet = strings.ReplaceAll(Otvet, "value := Request.FieldName", TextGolangLine)
//} //}
Otvet = strings.ReplaceAll(Otvet, "Request2.ColumnName", "Request2."+TextRequestField)
Otvet = strings.ReplaceAll(Otvet, "grpc_proto.RequestString", "grpc_proto."+TextRequest2) Otvet = strings.ReplaceAll(Otvet, "grpc_proto.RequestString", "grpc_proto."+TextRequest2)
Otvet = strings.ReplaceAll(Otvet, config.Settings.TEXT_TEMPLATE_MODEL+"_Update(", ModelName+"_"+FuncName+"(") Otvet = strings.ReplaceAll(Otvet, config.Settings.TEXT_TEMPLATE_MODEL+"_Update(", ModelName+"_"+FuncName+"(")
Otvet = strings.ReplaceAll(Otvet, config.Settings.TEXT_TEMPLATE_MODEL, ModelName) Otvet = strings.ReplaceAll(Otvet, config.Settings.TEXT_TEMPLATE_MODEL, ModelName)
Otvet = strings.ReplaceAll(Otvet, config.Settings.TEXT_TEMPLATE_TABLENAME, Table1.Name) Otvet = strings.ReplaceAll(Otvet, config.Settings.TEXT_TEMPLATE_TABLENAME, Table1.Name)
Otvet = strings.ReplaceAll(Otvet, "Request.ColumnName", TextRequestFieldGolang) Otvet = strings.ReplaceAll(Otvet, "Request.ColumnName", TextRequestFieldGolang)
Otvet = strings.ReplaceAll(Otvet, "Model.ColumnName", TextModelColumnName) Otvet = strings.ReplaceAll(Otvet, "Request2.ColumnName", "Request2."+TextRequestField)
Otvet = strings.ReplaceAll(Otvet, "m.ColumnName", TextModelColumnName)
Otvet = strings.ReplaceAll(Otvet, "ColumnName", ColumnName) Otvet = strings.ReplaceAll(Otvet, "ColumnName", ColumnName)
return Otvet return Otvet
@ -793,6 +800,9 @@ func CreateFilesCacheTest(Table1 *types.Table) error {
//замена RequestId{} //замена RequestId{}
TextGRPCServer = create_files.ReplaceTextRequestID_PrimaryKey(TextGRPCServer, Table1) TextGRPCServer = create_files.ReplaceTextRequestID_PrimaryKey(TextGRPCServer, Table1)
//Postgres_ID_Test = ID Minimum
TextGRPCServer = create_files.Replace_Model_ID_Test(TextGRPCServer, Table1)
//добавим импорт uuid //добавим импорт uuid
TextGRPCServer = create_files.CheckAndAddImportUUID_FromText(TextGRPCServer) TextGRPCServer = create_files.CheckAndAddImportUUID_FromText(TextGRPCServer)