From 6ec1421434440d153424b8dafc101bfccc680345 Mon Sep 17 00:00:00 2001 From: Nikitin Aleksandr Date: Tue, 23 Jan 2024 14:36:34 +0300 Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20mutex=5F?= =?UTF-8?q?GetVersionModel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../grpc/grpc_client/grpc_client_table_test.go_ | 2 +- .../nrpc/nrpc_client/nrpc_client_table_test.go_ | 2 +- .../nrpc_client_tables/nrpc_client_tables.go | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/templates/pkg/network/grpc/grpc_client/grpc_client_table_test.go_ b/bin/templates/pkg/network/grpc/grpc_client/grpc_client_table_test.go_ index 261d9a4..1827063 100644 --- a/bin/templates/pkg/network/grpc/grpc_client/grpc_client_table_test.go_ +++ b/bin/templates/pkg/network/grpc/grpc_client/grpc_client_table_test.go_ @@ -1,7 +1,7 @@ package grpc_lawsuit_status_types import ( - config "github.com/ManyakRus/starter/config_main" + "github.com/ManyakRus/starter/config_main" "gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/network/grpc/grpc_client" "gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/object_model/entities/lawsuit_status_types" "math" diff --git a/bin/templates/pkg/network/nrpc/nrpc_client/nrpc_client_table_test.go_ b/bin/templates/pkg/network/nrpc/nrpc_client/nrpc_client_table_test.go_ index bc6ef22..d3f43eb 100644 --- a/bin/templates/pkg/network/nrpc/nrpc_client/nrpc_client_table_test.go_ +++ b/bin/templates/pkg/network/nrpc/nrpc_client/nrpc_client_table_test.go_ @@ -1,7 +1,7 @@ package nrpc_lawsuit_status_types import ( - config "github.com/ManyakRus/starter/config_main" + "github.com/ManyakRus/starter/config_main" "gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/network/nrpc/nrpc_client" "gitlab.aescorp.ru/dsp_dev/claim/sync_service/pkg/object_model/entities/lawsuit_status_types" "testing" diff --git a/internal/create_files/nrpc_client_tables/nrpc_client_tables.go b/internal/create_files/nrpc_client_tables/nrpc_client_tables.go index d65dbe0..5eaa67c 100644 --- a/internal/create_files/nrpc_client_tables/nrpc_client_tables.go +++ b/internal/create_files/nrpc_client_tables/nrpc_client_tables.go @@ -167,11 +167,11 @@ func CreateTestFiles(Table1 *types.Table) error { TextNRPCClient = strings.ReplaceAll(TextNRPCClient, config.Settings.TEXT_TEMPLATE_TABLENAME, Table1.Name) TextNRPCClient = config.Settings.TEXT_MODULE_GENERATED + TextNRPCClient - //if config.Settings.HAS_IS_DELETED == true { - // TextNRPCClient = DeleteFuncTestDelete(TextNRPCClient, ModelName, Table1) - // TextNRPCClient = DeleteFuncTestRestore(TextNRPCClient, ModelName, Table1) - //} - //TextNRPCClient = DeleteFuncTestFind_byExtID(TextNRPCClient, ModelName, Table1) + if config.Settings.HAS_IS_DELETED == true { + TextNRPCClient = DeleteFuncTestDelete(TextNRPCClient, ModelName, Table1) + TextNRPCClient = DeleteFuncTestRestore(TextNRPCClient, ModelName, Table1) + } + TextNRPCClient = DeleteFuncTestFind_byExtID(TextNRPCClient, ModelName, Table1) //Postgres_ID_Test = ID Minimum if Table1.IDMinimum != "" {