From 0da9f902cc7433414acc07415b4e9976fbf46b27 Mon Sep 17 00:00:00 2001 From: scoffs <67464545+scffs@users.noreply.github.com> Date: Tue, 19 Aug 2025 11:10:01 +0700 Subject: [PATCH 1/3] chore: rm unnecessary code --- packages/db/src/repositories/user/index.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/db/src/repositories/user/index.ts b/packages/db/src/repositories/user/index.ts index dfebea0..e7625e4 100644 --- a/packages/db/src/repositories/user/index.ts +++ b/packages/db/src/repositories/user/index.ts @@ -4,9 +4,7 @@ import { getById } from './user.get' import { getOrCreateByTelegramId } from './user.insert' export class UserRepository { - constructor(protected db: DbType) { - this.db = db - } + constructor(protected db: DbType) {} getById = getById getOrCreateByTelegramId = getOrCreateByTelegramId From aaf1cc83bf4954b021af070e5dd904d158d60d4a Mon Sep 17 00:00:00 2001 From: scoffs <67464545+scffs@users.noreply.github.com> Date: Tue, 19 Aug 2025 11:12:55 +0700 Subject: [PATCH 2/3] chore: add examples --- .env.example | 9 +++++++++ README.md | 6 ++++++ apps/api/.env.example | 7 +++++-- apps/bot/.env.example | 2 ++ packages/db/.env.example | 2 +- 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.env.example b/.env.example index e69de29..889b2a4 100644 --- a/.env.example +++ b/.env.example @@ -0,0 +1,9 @@ +POSTGRES_USER=wallet +POSTGRES_PASSWORD=analytic +POSTGRES_DB=wallet_analytic +POSTGRES_PORT=6432 + +API_HOST=localhost +API_PORT=3001 + +DB_URL=postgres://wallet:analytic@postgres:5432/wallet_analytic diff --git a/README.md b/README.md index 5801b9e..49b569b 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,12 @@ ## Development +### Dependencies + +```bash +bun i +``` + ### Docker #### 🔧 Run Containers diff --git a/apps/api/.env.example b/apps/api/.env.example index b6d811f..e5f7c2f 100644 --- a/apps/api/.env.example +++ b/apps/api/.env.example @@ -1,8 +1,11 @@ APP_PORT=3001 NODE_ENV=development +WEB_APP_URL=http://172.20.10.4:5174 -DB_URL=postgres://wallet:analytic@localhost:6432/wallet_analytic +BOT_TOKEN= +DB_URL=postgresql://wallet:analytic@localhost:6432/wallet_analytic AXIOM_TOKEN= -AXIOM_DATASET_NAME= + +AXIOM_DATASET_NAME=wallet diff --git a/apps/bot/.env.example b/apps/bot/.env.example index 73ce188..c450a56 100644 --- a/apps/bot/.env.example +++ b/apps/bot/.env.example @@ -1,3 +1,5 @@ API_ID= API_HASH= BOT_TOKEN= + +DB_URL=postgres://wallet:analytic@localhost:6432/wallet_analytic diff --git a/packages/db/.env.example b/packages/db/.env.example index 1c16d07..e4cf282 100644 --- a/packages/db/.env.example +++ b/packages/db/.env.example @@ -1 +1 @@ -DB_URL=postgres://user:password@localhost:6432/botdb +DB_URL=postgres://wallet:analytic@localhost:6432/wallet_analytic From b789eaca530e44bd5f3d9fe8469cb254f0915c85 Mon Sep 17 00:00:00 2001 From: scoffs <67464545+scffs@users.noreply.github.com> Date: Tue, 19 Aug 2025 12:38:58 +0700 Subject: [PATCH 3/3] chore: fix db connect --- README.md | 7 +++++++ apps/api/.env.example | 2 +- docker-compose.dev.db.yml | 4 ---- packages/db/.env.example | 2 ++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 49b569b..4beacdc 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,13 @@ bun i #### 🔧 Run Containers +Stop and then start all + +```bash +docker-compose -f docker-compose.dev.yml -f docker-compose.dev.db.yml down +docker-compose -f docker-compose.dev.yml -f docker-compose.dev.db.yml up --build +``` + Start and build containers from scratch (removing volumes and local images): ```bash diff --git a/apps/api/.env.example b/apps/api/.env.example index e5f7c2f..a8991f0 100644 --- a/apps/api/.env.example +++ b/apps/api/.env.example @@ -3,7 +3,7 @@ NODE_ENV=development WEB_APP_URL=http://172.20.10.4:5174 BOT_TOKEN= -DB_URL=postgresql://wallet:analytic@localhost:6432/wallet_analytic +DB_URL=postgresql://wallet:analytic@postgres:5432/wallet_analytic AXIOM_TOKEN= diff --git a/docker-compose.dev.db.yml b/docker-compose.dev.db.yml index df13641..1a2b8c9 100644 --- a/docker-compose.dev.db.yml +++ b/docker-compose.dev.db.yml @@ -21,7 +21,3 @@ services: volumes: postgres_data: - -networks: - otel-net: - external: true diff --git a/packages/db/.env.example b/packages/db/.env.example index e4cf282..9aa17e3 100644 --- a/packages/db/.env.example +++ b/packages/db/.env.example @@ -1 +1,3 @@ +# We use localhost as this package runs on local machine +# and not in docker container. DB_URL=postgres://wallet:analytic@localhost:6432/wallet_analytic