From a5565c0590376b6cd56ccf44dfa441f64b4f0dad Mon Sep 17 00:00:00 2001 From: Samuel Tariku Date: Thu, 6 Nov 2025 18:55:43 +0300 Subject: [PATCH] fix: Modified the docker compose --- cmd/main.go | 12 ++++++------ docker-compose.yml | 2 +- makefile | 20 ++++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index 366a3cd..a5c223e 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -234,7 +234,7 @@ func main() { notificationSvc, domain.MongoDBLogger, ) - vitualGameRepo := repository.NewVirtualGameRepository(store) + virtualGamesRepo := repository.NewVirtualGameRepository(store) recommendationRepo := repository.NewRecommendationRepository(store) referalSvc := referralservice.New( @@ -248,18 +248,18 @@ func main() { raffleSvc := raffle.NewService( repository.NewRaffleStore(store), ) - virtualGameSvc := virtualgameservice.New(vitualGameRepo, *walletSvc, store, cfg, logger) - aleaService := alea.NewAleaPlayService(vitualGameRepo, *walletSvc, cfg, logger) + virtualGameSvc := virtualgameservice.New(virtualGamesRepo, *walletSvc, store, cfg, logger) + aleaService := alea.NewAleaPlayService(virtualGamesRepo, *walletSvc, cfg, logger) veliCLient := veli.NewClient(cfg, walletSvc) - veliVirtualGameService := veli.New(virtualGameSvc, vitualGameRepo, veliCLient, walletSvc, repository.NewTransferStore(store), domain.MongoDBLogger, cfg) + veliVirtualGameService := veli.New(virtualGameSvc, virtualGamesRepo, veliCLient, walletSvc, repository.NewTransferStore(store), domain.MongoDBLogger, cfg) orchestrationSvc := orchestration.New( virtualGameSvc, - virtuaGamesRepo, + virtualGamesRepo, cfg, veliCLient, ) atlasClient := atlas.NewClient(cfg, walletSvc) - atlasVirtualGameService := atlas.New(virtualGameSvc, vitualGameRepo, atlasClient, walletSvc, repository.NewTransferStore(store), cfg) + atlasVirtualGameService := atlas.New(virtualGameSvc, virtualGamesRepo, atlasClient, walletSvc, repository.NewTransferStore(store), cfg) recommendationSvc := recommendation.NewService(recommendationRepo) chapaClient := chapa.NewClient(cfg.CHAPA_BASE_URL, cfg.CHAPA_SECRET_KEY) diff --git a/docker-compose.yml b/docker-compose.yml index f8ef704..de2f8da 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,7 +26,7 @@ services: image: mongo:7.0.11 restart: always ports: - - "27025:27017" + - "27017:27017" environment: MONGO_INITDB_ROOT_USERNAME: root MONGO_INITDB_ROOT_PASSWORD: secret diff --git a/makefile b/makefile index b25835a..936aee9 100644 --- a/makefile +++ b/makefile @@ -46,45 +46,45 @@ postgres: .PHONY: backup backup: @mkdir -p backup - @docker exec -t fortunebet-postgres-1 pg_dump -U root --data-only --exclude-table=schema_migrations gh | gzip > backup/dump_`date +%Y-%m-%d"_"%H_%M_%S`.sql.gz + @docker exec -t fortunebet-backend-postgres-1 pg_dump -U root --data-only --exclude-table=schema_migrations gh | gzip > backup/dump_`date +%Y-%m-%d"_"%H_%M_%S`.sql.gz restore: @echo "Restoring latest backup..." @latest_file=$$(ls -t backup/dump_*.sql.gz | head -n 1); \ echo "Restoring from $$latest_file"; \ - gunzip -c $$latest_file | docker exec -i fortunebet-postgres-1 psql -U root -d gh + gunzip -c $$latest_file | docker exec -i fortunebet-backend-postgres-1 psql -U root -d gh restore_file: @echo "Restoring latest backup..." - gunzip -c $(file) | docker exec -i fortunebet-postgres-1 psql -U root -d gh + gunzip -c $(file) | docker exec -i fortunebet-backend-postgres-1 psql -U root -d gh .PHONY: seed_data seed_data: @echo "Waiting for PostgreSQL to be ready..." - @until docker exec fortunebet-postgres-1 pg_isready -U root -d gh; do \ + @until docker exec fortunebet-backend-postgres-1 pg_isready -U root -d gh; do \ echo "PostgreSQL is not ready yet..."; \ sleep 1; \ done @for file in db/data/*.sql; do \ echo "Seeding $$file..."; \ - cat $$file | docker exec -i fortunebet-postgres-1 psql -U root -d gh; \ + cat $$file | docker exec -i fortunebet-backend-postgres-1 psql -U root -d gh; \ done .PHONY: seed_dev_data seed_dev_data: @echo "Waiting for PostgreSQL to be ready..." - @until docker exec fortunebet-postgres-1 pg_isready -U root -d gh; do \ + @until docker exec fortunebet-backend-postgres-1 pg_isready -U root -d gh; do \ echo "PostgreSQL is not ready yet..."; \ sleep 1; \ done - cat db/scripts/fix_autoincrement_desync.sql | docker exec -i fortunebet-postgres-1 psql -U root -d gh; + cat db/scripts/fix_autoincrement_desync.sql | docker exec -i fortunebet-backend-postgres-1 psql -U root -d gh; @for file in db/dev_data/*.sql; do \ if [ -f "$$file" ]; then \ echo "Seeding $$file..."; \ - cat $$file | docker exec -i fortunebet-postgres-1 psql -U root -d gh; \ + cat $$file | docker exec -i fortunebet-backend-postgres-1 psql -U root -d gh; \ fi \ done postgres_log: - docker logs fortunebet-postgres-1 + docker logs fortunebet-backend-postgres-1 .PHONY: swagger swagger: @swag init -g cmd/main.go @@ -94,7 +94,7 @@ logs: db-up: | logs @mkdir -p logs @docker compose up -d postgres migrate mongo - @docker logs fortunebet-postgres-1 > logs/postgres.log 2>&1 & + @docker logs fortunebet-backend-postgres-1 > logs/postgres.log 2>&1 & .PHONY: db-down db-down: @docker compose down -v