Skip to content

refactor(circle): replace untyped ...any DI with typed Dependencies struct #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Chinonso-Peter wants to merge 6 commits into
base: master
Choose a base branch
from
Open

refactor(circle): replace untyped ...any DI with typed Dependencies struct #316

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d452198
Merge branch 'master' into refactor/circle-typed-di
cypriannwokolo2-creator Sep 1, 2026
6597dca
chore: re-trigger CI after ci.yml fix on master
cypriannwokolo2-creator Sep 1, 2026
61ae4f7
fix(api): repair master breakage on circle-typed-di (auth split, ince…
Chinonso-Peter Sep 1, 2026
d5a4d6d
Merge branch 'master' into refactor/circle-typed-di
Chinonso-Peter Sep 1, 2026
18704f0
Merge master (ci.yml fix + corruption repairs; PR head already contai…
cypriannwokolo2-creator Sep 1, 2026
a47ab51
Merge master (post-#317)
cypriannwokolo2-creator Sep 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22-alpine AS builder
FROM golang:1.25-alpine AS builder
WORKDIR /app
COPY go.mod go.sum ./
RUN go mod download
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.indexer
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22-alpine AS builder
FROM golang:1.25-alpine AS builder
WORKDIR /app
COPY go.mod go.sum ./
RUN go mod download
Expand Down
8 changes: 6 additions & 2 deletions cmd/api-server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,11 @@ func main() {
_ = ws.NewRedisBridge(wsHub, redisClient)

userSvc := user.NewService(userRepo, circleRepo)
circleSvc := circle.NewService(circleRepo, &moiAdapter{repo: userRepo}, &communityAdapter{repo: communityRepo}, wsBroadcaster, circle.NewTransactor(db))
circleSvc := circle.NewService(circleRepo, &moiAdapter{repo: userRepo}, circle.Dependencies{
CommunityChecker: &communityAdapter{repo: communityRepo},
Broadcaster: wsBroadcaster,
Transactor: circle.NewTransactor(db),
})
// Stellar client used for on-chain verification
horizonClient := stellar.NewClient(cfg.Stellar.HorizonURL, cfg.Stellar.SorobanRPCURL, cfg.Stellar.NetworkPassphrase)

Expand Down Expand Up @@ -251,7 +255,7 @@ func main() {
wsH := handler.NewWebSocketHandler(wsHub, cfg.CORS.AllowedOrigins)

authH := handler.NewAuthHandler(authSvc, userSvc, walletSvc, totpSvc, verificationSvc, emailSvc, redisClient, userRepo)
userH := handler.NewUserHandler(userSvc, redisClient)
userH := handler.NewUserHandler(userSvc)
circleH := handler.NewCircleHandler(circleSvc, inviteSvc, contribSvc, payoutSvc)
contribH := handler.NewContributionHandler(contribSvc, contribRepo)
payoutH := handler.NewPayoutHandler(payoutSvc, payoutRepo)
Expand Down
Loading
Loading