Merge branch 'main' into fix/custom-events

Author: vachmara

.github/workflows/test.yml

@@ -0,0 +1,101 @@
+name: Tests
+
+on:
+  push:
+    branches: [main, staging]
+  pull_request:
+    branches: [main, staging]
+
+jobs:
+  test:
+    name: Run Tests
+    runs-on: ubuntu-latest
+    
+    services:
+      postgres:
+        image: postgres:16
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: databuddy_test
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+      
+      redis:
+        image: redis:7-alpine
+        ports:
+          - 6379:6379
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+      
+      clickhouse:
+        image: clickhouse/clickhouse-server:latest
+        ports:
+          - 8123:8123
+          - 9000:9000
+        env:
+          CLICKHOUSE_DB: databuddy_test
+        options: >-
+          --health-cmd "clickhouse-client --query 'SELECT 1'"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
+      - name: Install dependencies
+        run: bun install --frozen-lockfile
+
+      - name: Run tests
+        env:
+          # Database URLs
+          DATABASE_URL: postgresql://postgres:postgres@localhost:5432/databuddy_test
+          POSTGRES_URL: postgresql://postgres:postgres@localhost:5432/databuddy_test
+          
+          # Redis URL
+          REDIS_URL: redis://localhost:6379
+          REDIS_HOST: localhost
+          REDIS_PORT: 6379
+          
+          # ClickHouse URLs
+          CLICKHOUSE_URL: http://localhost:8123
+          CLICKHOUSE_HOST: localhost
+          CLICKHOUSE_PORT: 8123
+          CLICKHOUSE_DATABASE: databuddy_test
+          
+          # Test environment
+          NODE_ENV: test
+          
+          # Auth secrets (use dummy values for tests)
+          AUTH_SECRET: test-auth-secret-for-ci-testing-only
+          NEXTAUTH_SECRET: test-auth-secret-for-ci-testing-only
+          
+          # API keys (use dummy values for tests)
+          EMAIL_API_KEY: test-email-api-key
+          IP_HASH_SALT: test-ip-hash-salt
+          
+        run: bun test
+
+      - name: Upload coverage reports
+        if: always()
+        uses: codecov/codecov-action@v4
+        with:
+          files: ./coverage/coverage-final.json
+          fail_ci_if_error: false
+          token: ${{ secrets.CODECOV_TOKEN }}
+

apps/api/package.json

@@ -20,6 +20,7 @@
     "@databuddy/redis": "workspace:*",
     "@databuddy/rpc": "workspace:*",
     "@databuddy/shared": "workspace:*",
+    "@databuddy/sdk": "workspace:*",
     "@elysiajs/cors": "^1.3.3",
     "@elysiajs/trpc": "^1.1.0",
     "@logtail/edge": "^0.5.5",

apps/api/src/lib/databuddy.ts

@@ -0,0 +1,7 @@
+import { Databuddy } from '@databuddy/sdk/node';
+
+const databuddy = new Databuddy({
+	clientId: '3ed1fce1-5a56-4cb6-a977-66864f6d18e3',
+});
+
+export { databuddy };

apps/api/src/routes/query.ts

@@ -13,6 +13,7 @@ import {
 	DynamicQueryRequestSchema,
 	type DynamicQueryRequestType,
 } from '../schemas';
+import { databuddy } from '../lib/databuddy';
 
 interface QueryParams {
 	start_date?: string;
@@ -213,6 +214,13 @@ export const query = new Elysia({ prefix: '/v1/query' })
 					: null;
 
 				const result = compileQuery(body as QueryRequest, websiteDomain);
+				databuddy.track({
+					name: 'compile_query',
+					properties: {
+						website_id,
+						website_domain: websiteDomain,
+					},
+				});
 				return {
 					success: true,
 					...result,

apps/api/tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     "lib": ["ESNext"],
     "target": "ESNext",
-    "module": "Preserve",
+    "module": "esnext",
     "moduleDetection": "force",
     "jsx": "react-jsx",
     "allowJs": true,

apps/basket/package.json

@@ -4,7 +4,12 @@
   "packageManager": "[email protected]",
   "scripts": {
     "dev": "bun --watch run src/index.ts --port 3002",
-    "start": "bun run src/index.ts --port 3002"
+    "start": "bun run src/index.ts --port 3002",
+    "test": "bun test",
+    "test:watch": "bun test --watch",
+    "test:routes": "bun test src/routes/*.test.ts",
+    "test:utils": "bun test src/utils/*.test.ts",
+    "test:coverage": "bun test --coverage"
   },
   "dependencies": {
     "@clickhouse/client": "catalog:",