📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
was added unit tests
YakovAkk9173855de0c0
diff --git a/docker-compose.yaml b/docker-compose.yamldeleted file mode 100644index cac19f013..000000000--- a/docker-compose.yaml+++ /dev/null@@ -1,59 +0,0 @@-version: '3.9'-services:- # This is the frontend, you can remove it if you want- swetrix:- image: swetrix/swetrix-fe:latest- restart: always- depends_on:- - swetrix-api- ports:- - '80:80'- environment:- - API_URL=http://localhost:8080/- swetrix-api:- image: swetrix/swetrix-api:latest- restart: always- ports:- - '8080:5005'- environment:- - REDIS_HOST=redis- - MYSQL_HOST=mariadb- - CLICKHOUSE_HOST=http://clickhouse- links:- - 'redis'- - 'mariadb'- - 'clickhouse'- depends_on:- - 'redis'- - 'mariadb'- - 'clickhouse'- redis:- image: redis:alpine- restart: always- environment:- - REDIS_PASSWORD=password- # volumes:- # - '/opt/redis-volume:/data'- mariadb:- image: linuxserver/mariadb:alpine- restart: always- environment:- - MYSQL_ROOT_PASSWORD=password- - MYSQL_DATABASE=analytics- - MYSQL_USER=swetrix- - MYSQL_PASSWORD=password- # volumes:- # - '/opt/mysql-volume:/var/lib/mysql'- clickhouse:- image: yandex/clickhouse-server:latest-alpine- environment:- - CLICKHOUSE_DB=analytics- - CLICKHOUSE_USER=default- - CLICKHOUSE_PASSWORD=password- restart: always- volumes:- - '/opt/clickhouse-volume:/var/lib/clickhouse'- ulimits:- nofile:- soft: 262144- hard: 262144diff --git a/docker-compose.yml b/docker-compose.ymlnew file mode 100644index 000000000..854c38a47--- /dev/null+++ b/docker-compose.yml@@ -0,0 +1,22 @@+version: ${DOCKER_VERSION}+services:+ mysql:+ image: mysql:${MYSQL_VERSION}+ container_name: swetrix-api-mysql+ environment:+ - MYSQL_ALLOW_EMPTY_PASSWORD=yes+ ports:+ - ${MYSQL_PORT}:3306+ redis:+ image: redis:${REDIS_VERSION}+ container_name: swetrix-api-redis+ ports:+ - ${REDIS_PORT}:6379+ clickhouse:+ image: clickhouse/clickhouse-server:${CLICKHOUSE_VERSION}+ container_name: swetrix-api-clickhouse+ ports:+ - ${CLICKHOUSE_PORT}:8123+networks:+ default:+ name: swetrix-api\ No newline at end of filediff --git a/package.json b/package.jsonindex be690d633..43396e501 100644--- a/package.json+++ b/package.json@@ -50,7 +50,7 @@"isbot": "^3.5.0","jsonwebtoken": "^8.5.1","lodash": "^4.17.21",- "mysql2": "^2.3.3",+ "mysql": "^2.18.1","nestjs-telegraf": "^2.6.0","newrelic": "^9.0.0","otplib": "^12.0.1",@@ -100,6 +100,9 @@"json","ts"],+ "moduleNameMapper": {+ "^src/(.*)$": "<rootDir>/$1"+ },"rootDir": "src","testRegex": ".*\\.spec\\.ts$","transform": {diff --git a/src/action-tokens/action-tokens.service.spec.ts b/src/action-tokens/action-tokens.service.spec.tsindex ca570be5f..ea6584a3f 100644--- a/src/action-tokens/action-tokens.service.spec.ts+++ b/src/action-tokens/action-tokens.service.spec.ts@@ -1,18 +1,30 @@import { Test, TestingModule } from '@nestjs/testing'+import { getRepositoryToken } from '@nestjs/typeorm'+import { Repository } from 'typeorm'+import { ActionToken } from './action-token.entity'import { ActionTokensService } from './action-tokens.service'describe('ActionTokensService', () => {let service: ActionTokensService-+ let repository: Repository<ActionToken>+ const ACTIONTOKEN_REPOSITORY = getRepositoryToken(ActionToken)beforeEach(async () => {const module: TestingModule = await Test.createTestingModule({- providers: [ActionTokensService],+ providers: [+ ActionTokensService,+ {+ provide: ACTIONTOKEN_REPOSITORY,+ useValue: { create: jest.fn(), save: jest.fn(), findOne: jest.fn() },+ },+ ],}).compile()-+ repository = module.get<Repository<ActionToken>>(ACTIONTOKEN_REPOSITORY)service = module.get<ActionTokensService>(ActionTokensService)})- it('should be defined', () => {- expect(service).toBeDefined()+ describe('root', () => {+ it('should be defined', () => {+ expect(service).toBeDefined()+ })})})diff --git a/src/analytics/analytics.controller.spec.ts b/src/analytics/analytics.controller.spec.tsindex ea1cbfb5d..cc415e54f 100644--- a/src/analytics/analytics.controller.spec.ts+++ b/src/analytics/analytics.controller.spec.ts@@ -1,18 +1,62 @@import { Test, TestingModule } from '@nestjs/testing'+import { getRepositoryToken } from '@nestjs/typeorm'+import { ActionTokensService } from 'src/action-tokens/action-tokens.service'+import { AppLoggerService } from 'src/logger/logger.service'+import { MailerService } from 'src/mailer/mailer.service'+import { ProjectShare } from 'src/project/entity/project-share.entity'+import { Project } from 'src/project/entity/project.entity'+import { ProjectService } from 'src/project/project.service'+import { TaskManagerService } from 'src/task-manager/task-manager.service'+import { User } from 'src/user/entities/user.entity'+import { UserService } from 'src/user/user.service'+import { Repository } from 'typeorm'import { AnalyticsController } from './analytics.controller'+import { AnalyticsService } from './analytics.service'+import { ActionToken } from '../action-tokens/action-token.entity'describe('AnalyticsController', () => {let controller: AnalyticsController-+ let projectsRepository: Repository<Project>+ let projectShareRepository: Repository<ProjectShare>+ const PROJECT_REPOSITORY_TOKEN = getRepositoryToken(Project)+ const PROJECTSHARE_REPOSITORY_TOKEN = getRepositoryToken(ProjectShare)+ const USER_REPOSITORY_TOKEN = getRepositoryToken(User)+ const ACTIONTOKEN_REPOSITORY = getRepositoryToken(ActionToken)beforeEach(async () => {const module: TestingModule = await Test.createTestingModule({controllers: [AnalyticsController],+ providers: [+ AnalyticsService,+ ProjectService,+ {+ provide: PROJECT_REPOSITORY_TOKEN,+ useValue: { create: jest.fn(), save: jest.fn(), findOne: jest.fn() },+ },+ {+ provide: PROJECTSHARE_REPOSITORY_TOKEN,+ useValue: { create: jest.fn(), save: jest.fn(), findOne: jest.fn() },+ },+ AppLoggerService,+ TaskManagerService,+ MailerService,+ UserService,+ {+ provide: USER_REPOSITORY_TOKEN,+ useValue: { create: jest.fn(), save: jest.fn(), findOne: jest.fn() },+ },+ ActionTokensService,+ {+ provide: ACTIONTOKEN_REPOSITORY,+ useValue: { create: jest.fn(), save: jest.fn(), findOne: jest.fn() },+ },+ ],}).compile()-controller = module.get<AnalyticsController>(AnalyticsController)})- it('should be defined', () => {- expect(controller).toBeDefined()+ describe('root', () => {+ it('should be defined', () => {+ expect(controller).toBeDefined()+ })})})diff --git a/src/analytics/analytics.module.ts b/src/analytics/analytics.module.tsindex b9d46551a..0619c76c0 100644--- a/src/analytics/analytics.module.ts+++ b/src/analytics/analytics.module.ts@@ -6,6 +6,7 @@ import { UserModule } from '../user/user.module'import { AppLoggerModule } from '../logger/logger.module'import { ProjectModule } from '../project/project.module'import { TaskManagerModule } from '../task-manager/task-manager.module'+import { TypeOrmModule } from '@nestjs/typeorm'@Module({imports: [diff --git a/src/analytics/analytics.service.spec.ts b/src/analytics/analytics.service.spec.tsindex c3e0f13d0..1a4f58de3 100644--- a/src/analytics/analytics.service.spec.ts+++ b/src/analytics/analytics.service.spec.ts@@ -1,18 +1,44 @@import { Test, TestingModule } from '@nestjs/testing'+import { getRepositoryToken } from '@nestjs/typeorm'+import { ProjectShare } from 'src/project/entity/project-share.entity'+import { Project } from 'src/project/entity/project.entity'+import { ProjectService } from 'src/project/project.service'+import { Repository } from 'typeorm'import { AnalyticsService } from './analytics.service'describe('AnalyticsService', () => {let service: AnalyticsService-+ let projectsRepository: Repository<Project>+ let projectShareRepository: Repository<ProjectShare>+ const PROJECT_REPOSITORY_TOKEN = getRepositoryToken(Project)+ const PROJECTSHARE_REPOSITORY_TOKEN = getRepositoryToken(ProjectShare)beforeEach(async () => {const module: TestingModule = await Test.createTestingModule({- providers: [AnalyticsService],+ providers: [+ AnalyticsService,+ ProjectService,+ {+ provide: PROJECT_REPOSITORY_TOKEN,+ useValue: { create: jest.fn(), save: jest.fn(), findOne: jest.fn() },+ },+ {+ provide: PROJECTSHARE_REPOSITORY_TOKEN,+ useValue: { create: jest.fn(), save: jest.fn(), findOne: jest.fn() },+ },+ ],}).compile()-+ projectsRepository = module.get<Repository<Project>>(+ PROJECT_REPOSITORY_TOKEN,+ )+ projectShareRepository = module.get<Repository<ProjectShare>>(+ PROJECTSHARE_REPOSITORY_TOKEN,+ )service = module.get<AnalyticsService>(AnalyticsService)})- it('should be defined', () => {- expect(service).toBeDefined()+ describe('root', () => {+ it('should be defined', () => {+ expect(service).toBeDefined()+ })})})diff --git a/src/auth/auth.controller.spec.ts b/src/auth/auth.controller.spec.tsindex 6f8bc5e16..3518848e9 100644--- a/src/auth/auth.controller.spec.ts+++ b/src/auth/auth.controller.spec.ts@@ -1,18 +1,72 @@import { Test, TestingModule } from '@nestjs/testing'+import { ActionTokensService } from 'src/action-tokens/action-tokens.service'+import { AppLoggerService } from 'src/logger/logger.service'+import { MailerService } from 'src/mailer/mailer.service'+import { ProjectService } from 'src/project/project.service'+import { UserService } from 'src/user/user.service'import { AuthController } from './auth.controller'+import { AuthService } from './auth.service'+import { ProjectShare } from 'src/project/entity/project-share.entity'+import { getRepositoryToken } from '@nestjs/typeorm'+import { User } from 'src/user/entities/user.entity'+import { ActionToken } from 'src/action-tokens/action-token.entity'+import { Project } from 'src/project/entity/project.entity'+import { Repository } from 'typeorm'describe('AuthController', () => {let controller: AuthController-+ let userRepository: Repository<User>+ let actionTokensRepository: Repository<ActionToken>+ let projectsRepository: Repository<Project>+ let projectShareRepository: Repository<ProjectShare>+ const USER_REPOSITORY_TOKEN = getRepositoryToken(User)+ const ACRIONTOKENS_REPOSITORY_TOKEN = getRepositoryToken(ActionToken)+ const PROJECT_REPOSITORY_TOKEN = getRepositoryToken(Project)+ const PROJECTSHARE_REPOSITORY_TOKEN = getRepositoryToken(ProjectShare)beforeEach(async () => {const module: TestingModule = await Test.createTestingModule({controllers: [AuthController],+ providers: [+ AuthService,+ UserService,+ {+ provide: USER_REPOSITORY_TOKEN,+ useValue: { create: jest.fn(), save: jest.fn(), findOne: jest.fn() },+ },+ MailerService,+ ActionTokensService,+ {+ provide: ACRIONTOKENS_REPOSITORY_TOKEN,+ useValue: { create: jest.fn(), save: jest.fn(), findOne: jest.fn() },+ },+ ProjectService,+ {+ provide: PROJECT_REPOSITORY_TOKEN,+ useValue: { create: jest.fn(), save: jest.fn(), findOne: jest.fn() },+ },+ {+ provide: PROJECTSHARE_REPOSITORY_TOKEN,+ useValue: { create: jest.fn(), save: jest.fn(), findOne: jest.fn() },+ },+ AppLoggerService,+ ],}).compile()-+ projectsRepository = module.get<Repository<Project>>(+ PROJECT_REPOSITORY_TOKEN,+ )+ projectShareRepository = module.get<Repository<ProjectShare>>(+ PROJECTSHARE_REPOSITORY_TOKEN,+ )+ actionTokensRepository = module.get<Repository<ActionToken>>(+ ACRIONTOKENS_REPOSITORY_TOKEN,+ )+ userRepository = module.get<Repository<User>>(USER_REPOSITORY_TOKEN)controller = module.get<AuthController>(AuthController)})- it('should be defined', () => {- expect(controller).toBeDefined()+ describe('root', () => {+ it('should be defined', () => {+ expect(controller).toBeDefined()+ })})})diff --git a/src/auth/auth.service.spec.ts b/src/auth/auth.service.spec.tsnew file mode 100644index 000000000..36039b771--- /dev/null+++ b/src/auth/auth.service.spec.ts@@ -0,0 +1,39 @@+import { Test, TestingModule } from '@nestjs/testing'+import { getRepositoryToken } from '@nestjs/typeorm'+import { AppLoggerService } from 'src/logger/logger.service'+import { User } from 'src/user/entities/user.entity'+import { UserService } from 'src/user/user.service'+import { Repository } from 'typeorm'+import { AuthController } from './auth.controller'+import { AuthModule } from './auth.module'+import { AuthService } from './auth.service'++describe('AuthService', () => {+ let service: AuthService+ let repository: Repository<User>++ const USER_REPOSITORY_TOKEN = getRepositoryToken(User)++ beforeEach(async () => {+ const module: TestingModule = await Test.createTestingModule({+ providers: [+ AuthService,+ UserService,+ {+ provide: USER_REPOSITORY_TOKEN,+ useValue: { create: jest.fn(), save: jest.fn(), findOne: jest.fn() },+ },+ AppLoggerService,+ ],+ }).compile()++ repository = module.get<Repository<User>>(USER_REPOSITORY_TOKEN)+ service = module.get<AuthService>(AuthService)+ })++ describe('root', () => {+ it('should be defined', () => {+ expect(service).toBeDefined()+ })+ })+})diff --git a/src/mailer/mailer.service.spec.ts b/src/mailer/mailer.service.spec.tsindex d16256003..640b2b438 100644--- a/src/mailer/mailer.service.spec.ts+++ b/src/mailer/mailer.service.spec.ts@@ -1,4 +1,5 @@import { Test, TestingModule } from '@nestjs/testing'+import { AppLoggerService } from 'src/logger/logger.service'import { MailerService } from './mailer.service'describe('MailerService', () => {@@ -6,13 +7,14 @@ describe('MailerService', () => {beforeEach(async () => {const module: TestingModule = await Test.createTestingModule({- providers: [MailerService],+ providers: [MailerService, AppLoggerService],}).compile()service = module.get<MailerService>(MailerService)})-- it('should be defined', () => {- expect(service).toBeDefined()+ describe('root', () => {+ it('should be defined', () => {+ expect(service).toBeDefined()+ })})})diff --git a/src/marketplace/categories/categories.controller.spec.ts b/src/marketplace/categories/categories.controller.spec.tsindex 2bb26742c..b0802b800 100644--- a/src/marketplace/categories/categories.controller.spec.ts+++ b/src/marketplace/categories/categories.controller.spec.ts@@ -1,18 +1,40 @@import { Test, TestingModule } from '@nestjs/testing'+import { getRepositoryToken, TypeOrmModule } from '@nestjs/typeorm'+import { UserModule } from 'src/user/user.module'+import { Repository } from 'typeorm'import { CategoriesController } from './categories.controller'+import { CategoriesService } from './categories.service'+import { Category } from './category.entity'+import { UserService } from '../../user/user.service'+import { User } from 'src/user/entities/user.entity'describe('CategoriesController', () => {let controller: CategoriesController-+ const USER_REPOSITORY_TOKEN = getRepositoryToken(User)+ const CATEGORY_REPOSITORY_TOKEN = getRepositoryToken(Category)beforeEach(async () => {const module: TestingModule = await Test.createTestingModule({controllers: [CategoriesController],+ providers: [+ UserService,+ {+ provide: USER_REPOSITORY_TOKEN,+ useValue: { create: jest.fn(), save: jest.fn(), findOne: jest.fn() },+ },+ CategoriesService,+ {+ provide: CATEGORY_REPOSITORY_TOKEN,+ useValue: { create: jest.fn(), save: jest.fn(), findOne: jest.fn() },+ },+ ],}).compile()controller = module.get<CategoriesController>(CategoriesController)})- it('should be defined', () => {- expect(controller).toBeDefined()+ describe('root', () => {+ it('should be defined', () => {+ expect(controller).toBeDefined()+ })})})diff --git a/src/marketplace/categories/categories.service.spec.ts b/src/marketplace/categories/categories.service.spec.tsindex 1794100dc..c5f115c9c 100644--- a/src/marketplace/categories/categories.service.spec.ts+++ b/src/marketplace/categories/categories.service.spec.ts@@ -1,15 +1,28 @@import { Test, TestingModule } from '@nestjs/testing'import { CategoriesService } from './categories.service'+import { Repository } from 'typeorm'+import { Category } from './category.entity'+import { getRepositoryToken } from '@nestjs/typeorm'describe('CategoriesService', () => {let service: CategoriesService+ let repository: Repository<Category>++ const CATEGORY_REPOSITORY_TOKEN = getRepositoryToken(Category)beforeEach(async () => {const module: TestingModule = await Test.createTestingModule({- providers: [CategoriesService],+ providers: [+ CategoriesService,+ {+ provide: CATEGORY_REPOSITORY_TOKEN,+ useValue: { create: jest.fn(), save: jest.fn(), findOne: jest.fn() },+ },+ ],}).compile()service = module.get<CategoriesService>(CategoriesService)+ repository = module.get<Repository<Category>>(CATEGORY_REPOSITORY_TOKEN)})it('should be defined', () => {diff --git a/src/marketplace/extensions/extensions.service.spec.ts b/src/marketplace/extensions/extensions.service.spec.tsindex e651a2736..08b328ca0 100644--- a/src/marketplace/extensions/extensions.service.spec.ts+++ b/src/marketplace/extensions/extensions.service.spec.ts@@ -1,18 +1,29 @@import { Test, TestingModule } from '@nestjs/testing'+import { getRepositoryToken } from '@nestjs/typeorm'+import { User } from 'src/user/entities/user.entity'import { ExtensionsService } from './extensions.service'+import { Extension } from './extension.entity'describe('ExtensionsService', () => {let service: ExtensionsService-+ const EXTENSION_REPOSITORY_TOKEN = getRepositoryToken(Extension)beforeEach(async () => {const module: TestingModule = await Test.createTestingModule({- providers: [ExtensionsService],+ providers: [+ ExtensionsService,+ {+ provide: EXTENSION_REPOSITORY_TOKEN,+ useValue: { create: jest.fn(), save: jest.fn(), findOne: jest.fn() },+ },+ ],}).compile()service = module.get<ExtensionsService>(ExtensionsService)})- it('should be defined', () => {- expect(service).toBeDefined()+ describe('root', () => {+ it('should be defined', () => {+ expect(service).toBeDefined()+ })})})