fix: removed di register functions.

.pre-commit-config.yaml

@@ -29,7 +29,7 @@ repos:
         args: ["--autofix", "--no-ensure-ascii", "--no-sort-keys"]
       - id: trailing-whitespace
   - repo: https://github.com/crate-ci/typos
-    rev: v1.28.1
+    rev: v1.29.4
     hooks:
       - id: typos
         verbose: true
@@ -41,13 +41,13 @@ repos:
             go.mod
           )$
   - repo: https://github.com/compilerla/conventional-pre-commit
-    rev: v3.6.0
+    rev: v4.0.0
     hooks:
       - id: conventional-pre-commit
         stages: [commit-msg]
         args: []
   - repo: https://github.com/golangci/golangci-lint
-    rev: v1.62.2
+    rev: v1.63.4
     hooks:
       - id: golangci-lint
   - repo: local

.tool-versions

@@ -1,2 +1,2 @@
 pre-commit 3.8.0
-golang 1.23.4
+golang 1.23.5

Makefile

@@ -29,12 +29,12 @@ init: dep-tools
 	command -v protoc-gen-go-grpc >/dev/null || go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
 	command -v stringer >/dev/null || go install golang.org/x/tools/cmd/stringer@latest
 
-.PHONY: dev-samplesvc
-dev-samplesvc:
+.PHONY: sample-dev
+sample-dev:
 	air --build.bin "./tmp/samplesvc" --build.cmd "go build -o ./tmp/samplesvc ./cmd/samplesvc/"
 
-.PHONY: run-samplesvc
-run-samplesvc:
+.PHONY: sample-run
+sample-run:
 	go run ./cmd/samplesvc/
 
 .PHONY: migrate
@@ -60,7 +60,7 @@ test:
 .PHONY: test-cov
 test-cov:
 	go test -failfast -race -count 1 -coverpkg=./... -coverprofile=${TMPDIR}cov_profile.out ./...
-	# `go env GOPATH`/bin/gcov2lcov -infile ${TMPDIR}cov_profile.out -outfile ./cov_profile.lcov
+	# gcov2lcov -infile ${TMPDIR}cov_profile.out -outfile ./cov_profile.lcov
 
 .PHONY: test-view-html
 test-view-html:
@@ -85,12 +85,17 @@ test-ci: test-cov
 
 .PHONY: lint
 lint:
-	`go env GOPATH`/bin/golangci-lint run ./...
+	golangci-lint run ./...
 
 .PHONY: check
 check:
-	`go env GOPATH`/bin/govulncheck ./...
-	`go env GOPATH`/bin/betteralign ./...
+	govulncheck ./...
+	betteralign ./...
+
+.PHONY: fix
+fix:
+	betteralign -apply ./...
+	go fmt ./...
 
 .PHONY: postgres-start
 postgres-start:

go.mod

@@ -1,6 +1,6 @@
 module github.com/eser/go-service
 
-go 1.23.4
+go 1.23.5
 
 require (
 	github.com/getkin/kin-openapi v0.128.0

pkg/bliss/configfx/README.md

@@ -9,25 +9,6 @@ package is designed to work seamlessly with the `bliss/di` package.
 The documentation below provides an overview of the package, its types, functions, and usage examples. For more detailed
 information, refer to the source code and tests.
 
-## Bliss DI
-
-The `configfx` package provides a `RegisterDependencies` function that can be used to integrate with the `bliss/di`
-package.
-
-```go
-import (
-  ...
-  "github.com/eser/go-service/pkg/bliss/di"
-	"github.com/eser/go-service/pkg/bliss/configfx"
-  ...
-)
-
-err := di.RegisterFn(
-	configfx.RegisterDependencies,                 // registers configfx.ConfigLoader
-	...
-)
-```
-
 ## API
 
 ### ConfigLoader interface

pkg/bliss/datafx/registry.go

@@ -18,7 +18,7 @@ type SqlExecutor interface {
 
 type SqlDataSource interface {
 	GetConnection() SqlExecutor
-	UseUnitOfWork(ctx context.Context) (UnitOfWork, error)
+	UseUnitOfWork(ctx context.Context) (*UnitOfWork, error)
 }
 
 type Registry struct {

pkg/bliss/datafx/sqldatasource-std.go

@@ -10,8 +10,6 @@ type SqlDataSourceStd struct {
 	connection *sql.DB
 }
 
-var _ SqlDataSource = (*SqlDataSourceStd)(nil)
-
 func NewSqlDataSourceStd(ctx context.Context, dialect Dialect, dsn string) (*SqlDataSourceStd, error) {
 	connection, err := sql.Open(string(dialect), dsn)
 	if err != nil {
@@ -31,10 +29,10 @@ func (dataSource *SqlDataSourceStd) GetConnection() SqlExecutor { //nolint:iretu
 	return dataSource.connection
 }
 
-func (dataSource *SqlDataSourceStd) UseUnitOfWork(ctx context.Context) (UnitOfWork, error) { //nolint:ireturn
+func (dataSource *SqlDataSourceStd) UseUnitOfWork(ctx context.Context) (*UnitOfWork, error) {
 	uow, err := UseUnitOfWork(ctx, dataSource.connection)
 	if err != nil {
-		return nil, err
+		return &UnitOfWork{}, err
 	}
 
 	return uow, err

pkg/bliss/datafx/unit-of-work.go

@@ -17,36 +17,26 @@ type TransactionFinalizer interface {
 	Commit() error
 }
 
-type UnitOfWork interface {
-	TxScope() TransactionFinalizer
-	Context() context.Context
-	Bind(context context.Context, txScope TransactionFinalizer)
-	Commit() error
-	Close() error
-}
-
-type UnitOfWorkImpl struct {
+type UnitOfWork struct {
 	context context.Context //nolint:containedctx
 	txScope TransactionFinalizer
 }
 
-var _ UnitOfWork = (*UnitOfWorkImpl)(nil)
-
-// func NewUnitOfWork() *UnitOfWorkImpl {
-// 	return &UnitOfWorkImpl{}
+// func NewUnitOfWork() *UnitOfWork {
+// 	return &UnitOfWork{}
 // }
 
 type TransactionStarter interface {
 	BeginTx(ctx context.Context, opts *sql.TxOptions) (*sql.Tx, error)
 }
 
-func UseUnitOfWork(ctx context.Context, transactionStarter TransactionStarter) (UnitOfWork, error) { //nolint:ireturn,varnamelen,lll
-	uow, ok := ctx.Value(ContextKeyUnitOfWork).(UnitOfWork)
+func UseUnitOfWork(ctx context.Context, transactionStarter TransactionStarter) (*UnitOfWork, error) {
+	uow, ok := ctx.Value(ContextKeyUnitOfWork).(*UnitOfWork)
 	if ok {
 		return uow, nil
 	}
 
-	uow = &UnitOfWorkImpl{} //nolint:exhaustruct
+	uow = &UnitOfWork{} //nolint:exhaustruct
 	newCtx := context.WithValue(ctx, ContextKeyUnitOfWork, uow)
 
 	transaction, err := transactionStarter.BeginTx(newCtx, nil)
@@ -59,27 +49,27 @@ func UseUnitOfWork(ctx context.Context, transactionStarter TransactionStarter) (
 	return uow, nil
 }
 
-func (uow *UnitOfWorkImpl) TxScope() TransactionFinalizer { //nolint:ireturn
+func (uow *UnitOfWork) TxScope() TransactionFinalizer { //nolint:ireturn
 	return uow.txScope
 }
 
-func (uow *UnitOfWorkImpl) Context() context.Context {
+func (uow *UnitOfWork) Context() context.Context {
 	return uow.context
 }
 
-func (uow *UnitOfWorkImpl) Bind(context context.Context, txScope TransactionFinalizer) {
+func (uow *UnitOfWork) Bind(context context.Context, txScope TransactionFinalizer) {
 	uow.context = context
 	uow.txScope = txScope
 }
 
-func (uow *UnitOfWorkImpl) Commit() error {
+func (uow *UnitOfWork) Commit() error {
 	return uow.txScope.Commit() //nolint:wrapcheck
 }
 
-func (uow *UnitOfWorkImpl) Close() error {
+func (uow *UnitOfWork) Close() error {
 	return uow.txScope.Rollback() //nolint:wrapcheck
 }
 
-func (uow *UnitOfWorkImpl) Use(fn func(TransactionFinalizer) any) {
+func (uow *UnitOfWork) Use(fn func(TransactionFinalizer) any) {
 	fn(uow.txScope)
 }