From eefff944616cb7ca22580537d36528874045311e Mon Sep 17 00:00:00 2001 From: Nikitin Aleksandr Date: Fri, 3 May 2024 11:23:59 +0300 Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=B3?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B2=20notifier=5Fservice?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pkg/db/crud/crud_table_update.go_ | 2 +- internal/create_files/create_files.go | 4 +++- .../server_grpc_tables/server_grpc_tables.go | 20 ++++++++++++++----- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/bin/templates/pkg/db/crud/crud_table_update.go_ b/bin/templates/pkg/db/crud/crud_table_update.go_ index 070e5aa..b35b33d 100644 --- a/bin/templates/pkg/db/crud/crud_table_update.go_ +++ b/bin/templates/pkg/db/crud/crud_table_update.go_ @@ -43,6 +43,6 @@ func UpdateManyFields_ctx(ctx context.Context, db *gorm.DB, m *lawsuit_status_ty return err } - err = create_update_ctx(ctx, db, m, false, MassNeedUpdateFields) + err = create_update_ctx(ctx, db, m, MassNeedUpdateFields) return err } diff --git a/internal/create_files/create_files.go b/internal/create_files/create_files.go index 83ac0c1..ef9eddd 100644 --- a/internal/create_files/create_files.go +++ b/internal/create_files/create_files.go @@ -1443,7 +1443,7 @@ func FindTextProtobufRequest_ID_Type(Table1 *types.Table, Column1 *types.Column, } case "uuid.UUID": { - if Column1.TypeGo == "string" && PrimaryKeyColumn.TypeGo == "string" { + if PrimaryKeyColumn.TypeGo == "string" || PrimaryKeyColumn.TypeGo == "uuid.UUID" { TextRequestProtoName = "String" TextRequestFieldName = "String_2" TextRequestFieldGolang = VariableName + "String_2" @@ -1817,6 +1817,7 @@ func Replace_Model_ID_Test(Text string, Table1 *types.Table) string { if IDMinimum == "" { IDMinimum = FindTextDefaultValue(PrimaryKeyColumn.TypeGo) } + DefaultModelName := config.Settings.TEXT_TEMPLATE_MODEL if PrimaryKeyColumn.TypeGo == "uuid.UUID" { if Table1.IDMinimum == "" { @@ -1824,6 +1825,7 @@ func Replace_Model_ID_Test(Text string, Table1 *types.Table) string { } else { Otvet = strings.ReplaceAll(Otvet, TextFind, `var `+ModelName+`_ID_Test, _ = uuid.Parse("`+IDMinimum+`")`) } + Otvet = strings.ReplaceAll(Otvet, ``+DefaultModelName+`_ID_Test`, ``+ModelName+`_ID_Test.String()`) } else { Otvet = strings.ReplaceAll(Otvet, TextFind, `const `+ModelName+`_ID_Test = `+IDMinimum) } diff --git a/internal/create_files/server_grpc_tables/server_grpc_tables.go b/internal/create_files/server_grpc_tables/server_grpc_tables.go index 792b265..6a02b64 100644 --- a/internal/create_files/server_grpc_tables/server_grpc_tables.go +++ b/internal/create_files/server_grpc_tables/server_grpc_tables.go @@ -567,8 +567,6 @@ func CreateFilesUpdateEveryColumnTest(Table1 *types.Table) error { //заменим имя пакета на новое 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 { @@ -592,6 +590,12 @@ func CreateFilesUpdateEveryColumnTest(Table1 *types.Table) error { //создание текста 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 == "" { return err @@ -661,18 +665,21 @@ func FindTextUpdateEveryColumnTest1(TextGRPCServerUpdateFunc string, Table1 *typ ColumnName := Column1.NameGo FuncName := "Update_" + ColumnName 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 != "" { // 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, 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_TABLENAME, Table1.Name) 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) return Otvet @@ -793,6 +800,9 @@ func CreateFilesCacheTest(Table1 *types.Table) error { //замена RequestId{} TextGRPCServer = create_files.ReplaceTextRequestID_PrimaryKey(TextGRPCServer, Table1) + //Postgres_ID_Test = ID Minimum + TextGRPCServer = create_files.Replace_Model_ID_Test(TextGRPCServer, Table1) + //добавим импорт uuid TextGRPCServer = create_files.CheckAndAddImportUUID_FromText(TextGRPCServer)