diff --git a/bin/templates/internal/app/grpc/server_grpc/server_grpc.go_ b/bin/templates/internal/app/grpc/server_grpc/server_grpc.go_ index b1d819b..8f59203 100644 --- a/bin/templates/internal/app/grpc/server_grpc/server_grpc.go_ +++ b/bin/templates/internal/app/grpc/server_grpc/server_grpc.go_ @@ -32,7 +32,7 @@ func (s *ServerGRPC) LawsuitStatusType_Read(ctx context.Context, Request *grpc_p db := postgres_gorm.GetConnection() ID := Request.ID m := &lawsuit_status_types.LawsuitStatusType{} - m.ID = IntToAlias(ID) + m.ID = AliasFromInt(ID) err = crud_lawsuit_status_types.Read_ctx(ctx, db, m) if err != nil { return &Otvet, err @@ -71,7 +71,7 @@ func (s *ServerGRPC) LawsuitStatusType_Delete(ctx context.Context, Request *grpc db := postgres_gorm.GetConnection() ID := Request.ID m := &lawsuit_status_types.LawsuitStatusType{} - m.ID = IntToAlias(ID) + m.ID = AliasFromInt(ID) err = crud_lawsuit_status_types.Delete_ctx(ctx, db, m) if err != nil { return &Otvet, err @@ -110,7 +110,7 @@ func (s *ServerGRPC) LawsuitStatusType_Restore(ctx context.Context, Request *grp db := postgres_gorm.GetConnection() ID := Request.ID m := &lawsuit_status_types.LawsuitStatusType{} - m.ID = IntToAlias(ID) + m.ID = AliasFromInt(ID) err = crud_lawsuit_status_types.Restore_ctx(ctx, db, m) if err != nil { return &Otvet, err diff --git a/bin/templates/pkg/db/crud/crud_table_cache.go_ b/bin/templates/pkg/db/crud/crud_table_cache.go_ index 2512feb..5699e79 100644 --- a/bin/templates/pkg/db/crud/crud_table_cache.go_ +++ b/bin/templates/pkg/db/crud/crud_table_cache.go_ @@ -54,7 +54,7 @@ func ReadFromCache_ctx(ctx context.Context, db *gorm.DB, ID int64) (lawsuit_stat var err error - Otvet.ID = IntToAlias(ID) + Otvet.ID = AliasFromInt(ID) err = Read_ctx(ctx, db, &Otvet) if err == nil { cache.Add(ID, Otvet) diff --git a/bin/templates/pkg/db/crud/crud_tables.go_ b/bin/templates/pkg/db/crud/crud_tables.go_ index 3129e82..42c1338 100644 --- a/bin/templates/pkg/db/crud/crud_tables.go_ +++ b/bin/templates/pkg/db/crud/crud_tables.go_ @@ -48,7 +48,7 @@ func Read_ctx(ctx context.Context, db *gorm.DB, m *lawsuit_status_types.LawsuitS db.WithContext(ctx) - tx := db.First(m, id) + tx := db.First(m) err = tx.Error if err != nil { err = fmt.Errorf(m.TableNameDB()+" Read() id: %v, error: %v", id, err) diff --git a/bin/templates/pkg/db/crud/crud_tables_rapira.go_ b/bin/templates/pkg/db/crud/crud_tables_rapira.go_ index b591fd7..bcca14a 100644 --- a/bin/templates/pkg/db/crud/crud_tables_rapira.go_ +++ b/bin/templates/pkg/db/crud/crud_tables_rapira.go_ @@ -48,7 +48,7 @@ func Read_ctx(ctx context.Context, db *gorm.DB, m *lawsuit_status_types.LawsuitS db.WithContext(ctx) - tx := db.First(m, id) + tx := db.First(m) err = tx.Error if err != nil { err = fmt.Errorf(m.TableNameDB()+" Read() id: %v, error: %v", id, err) diff --git a/internal/create_files/create_files.go b/internal/create_files/create_files.go index b12a472..9b3bd07 100644 --- a/internal/create_files/create_files.go +++ b/internal/create_files/create_files.go @@ -226,12 +226,12 @@ func ReplacePrimaryKeyOtvetID(Text string, Table1 *types.Table) string { //Alias преобразуем в int64, и наоборот if Alias != "" { Otvet = strings.ReplaceAll(Otvet, "IntFromAlias(Otvet.ID)", ColumnTypeGoPK+"(Otvet."+ColumnNamePK+")") - Otvet = strings.ReplaceAll(Otvet, "IntToAlias(Otvet.ID)", OtvetColumnName) - Otvet = strings.ReplaceAll(Otvet, "IntToAlias(ID)", Alias+"("+ColumnNamePK+")") + Otvet = strings.ReplaceAll(Otvet, "AliasFromInt(Otvet.ID)", OtvetColumnName) + Otvet = strings.ReplaceAll(Otvet, "AliasFromInt(ID)", Alias+"("+ColumnNamePK+")") } else { Otvet = strings.ReplaceAll(Otvet, "IntFromAlias(Otvet.ID)", "Otvet."+ColumnNamePK+"") - Otvet = strings.ReplaceAll(Otvet, "IntToAlias(Otvet.ID)", OtvetColumnName) - Otvet = strings.ReplaceAll(Otvet, "IntToAlias(ID)", "ID") + Otvet = strings.ReplaceAll(Otvet, "AliasFromInt(Otvet.ID)", OtvetColumnName) + Otvet = strings.ReplaceAll(Otvet, "AliasFromInt(ID)", "ID") } return Otvet