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..4beacdc 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,23 @@ ## Development +### Dependencies + +```bash +bun i +``` + ### Docker #### 🔧 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 b6d811f..a8991f0 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@postgres:5432/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/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 1c16d07..9aa17e3 100644 --- a/packages/db/.env.example +++ b/packages/db/.env.example @@ -1 +1,3 @@ -DB_URL=postgres://user:password@localhost:6432/botdb +# We use localhost as this package runs on local machine +# and not in docker container. +DB_URL=postgres://wallet:analytic@localhost:6432/wallet_analytic 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