📈 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
add post, delete, put for admin
kruzhambusbb511a3bbb3b
diff --git a/src/project/project.controller.ts b/src/project/project.controller.tsindex de5928857..a4e9858d6 100644--- a/src/project/project.controller.ts+++ b/src/project/project.controller.ts@@ -12,25 +12,25 @@ import {HttpCode,NotFoundException,ForbiddenException,-} from '@nestjs/common';-import { ApiTags, ApiQuery, ApiResponse } from '@nestjs/swagger';-import * as _isEmpty from 'lodash/isEmpty';-import * as _map from 'lodash/map';-import * as _trim from 'lodash/trim';-import * as _size from 'lodash/size';-import * as _values from 'lodash/values';--import { ProjectService } from './project.service';-import { UserType, ACCOUNT_PLANS } from '../user/entities/user.entity';-import { Roles } from '../common/decorators/roles.decorator';-import { SelfhostedGuard } from 'src/common/guards/selfhosted.guard';-import { RolesGuard } from '../common/guards/roles.guard';-import { Pagination } from '../common/pagination/pagination';-import { Project } from './entity/project.entity';-import { CurrentUserId } from '../common/decorators/current-user-id.decorator';-import { UserService } from '../user/user.service';-import { ProjectDTO } from './dto/project.dto';-import { AppLoggerService } from '../logger/logger.service';+} from '@nestjs/common'+import { ApiTags, ApiQuery, ApiResponse } from '@nestjs/swagger'+import * as _isEmpty from 'lodash/isEmpty'+import * as _map from 'lodash/map'+import * as _trim from 'lodash/trim'+import * as _size from 'lodash/size'+import * as _values from 'lodash/values'++import { ProjectService } from './project.service'+import { UserType, ACCOUNT_PLANS } from '../user/entities/user.entity'+import { Roles } from '../common/decorators/roles.decorator'+import { SelfhostedGuard } from 'src/common/guards/selfhosted.guard'+import { RolesGuard } from '../common/guards/roles.guard'+import { Pagination } from '../common/pagination/pagination'+import { Project } from './entity/project.entity'+import { CurrentUserId } from '../common/decorators/current-user-id.decorator'+import { UserService } from '../user/user.service'+import { ProjectDTO } from './dto/project.dto'+import { AppLoggerService } from '../logger/logger.service'import {redis,isValidPID,@@ -38,13 +38,13 @@ import {redisProjectCacheTimeout,clickhouse,isSelfhosted,-} from '../common/constants';+} from '../common/constants'import {getProjectsClickhouse,createProjectClickhouse,updateProjectClickhouse,deleteProjectClickhouse,-} from '../common/utils';+} from '../common/utils'@ApiTags('Project')@Controller('project')@@ -67,32 +67,32 @@ export class ProjectController {@Query('take') take: number | undefined,@Query('skip') skip: number | undefined,): Promise<Pagination<Project> | Project[] | object> {- this.logger.log({ userId, take, skip }, 'GET /project');+ this.logger.log({ userId, take, skip }, 'GET /project')if (isSelfhosted) {- const results = await getProjectsClickhouse();- const formatted = _map(results, this.projectService.formatFromClickhouse);+ const results = await getProjectsClickhouse()+ const formatted = _map(results, this.projectService.formatFromClickhouse)return {results,page_total: _size(formatted),total: _size(formatted),totalMonthlyEvents: 0, // not needed as it's selfhosed- };+ }} else {- const where = Object();- where.admin = userId;+ const where = Object()+ where.admin = userIdconst paginated = await this.projectService.paginate({ take, skip },where,- );+ )const totalMonthlyEvents = await this.projectService.getRedisCount(userId,- );+ )return {...paginated,totalMonthlyEvents,- };+ }}}@@ -107,10 +107,10 @@ export class ProjectController {@Query('take') take: number | undefined,@Query('skip') skip: number | undefined,): Promise<Project | object> {- this.logger.log({ take, skip }, 'GET all');+ this.logger.log({ take, skip }, 'GET all')- const where = Object();- return await this.projectService.paginate({ take, skip }, where);+ const where = Object()+ return await this.projectService.paginate({ take, skip }, where)}@Get('/user/:id')@@ -126,18 +126,18 @@ export class ProjectController {@Query('take') take: number | undefined,@Query('skip') skip: number | undefined,): Promise<Pagination<Project> | Project[] | object> {- this.logger.log({ userId, take, skip }, 'GET /user/:id');+ this.logger.log({ userId, take, skip }, 'GET /user/:id')- const where = Object();- where.admin = userId;+ const where = Object()+ where.admin = userId- const paginated = await this.projectService.paginate({ take, skip }, where);- const totalMonthlyEvents = await this.projectService.getRedisCount(userId);+ const paginated = await this.projectService.paginate({ take, skip }, where)+ const totalMonthlyEvents = await this.projectService.getRedisCount(userId)return {...paginated,totalMonthlyEvents,- };+ }}@Get('/:id')@@ -146,30 +146,30 @@ export class ProjectController {@Param('id') id: string,@CurrentUserId() uid: string,): Promise<Project | object> {- this.logger.log({ id }, 'GET /project/:id');+ this.logger.log({ id }, 'GET /project/:id')if (!isValidPID(id))throw new BadRequestException('The provided Project ID (pid) is incorrect',- );+ )- let project;+ let projectif (isSelfhosted) {- project = await getProjectsClickhouse(id);+ project = await getProjectsClickhouse(id)} else {- project = await this.projectService.findOne(id);+ project = await this.projectService.findOne(id)}if (_isEmpty(project))- throw new NotFoundException('Project was not found in the database');+ throw new NotFoundException('Project was not found in the database')- this.projectService.allowedToView(project, uid);+ this.projectService.allowedToView(project, uid)if (isSelfhosted) {- return this.projectService.formatFromClickhouse(project);+ return this.projectService.formatFromClickhouse(project)}- return project;+ return project}@Post('/admin/:id')@@ -181,47 +181,47 @@ export class ProjectController {@Param('id') userId: string,@Body() projectDTO: ProjectDTO,): Promise<Project> {- this.logger.log({ userId, projectDTO }, 'POST /project/admin');+ this.logger.log({ userId, projectDTO }, 'POST /project/admin')const user = await this.userService.findOneWithRelations(userId, ['projects',- ]);- const maxProjects = ACCOUNT_PLANS[user.planCode]?.maxProjects;+ ])+ const maxProjects = ACCOUNT_PLANS[user.planCode]?.maxProjectsif (!user.isActive) {- throw new ForbiddenException('Please, verify your email address first');+ throw new ForbiddenException('Please, verify your email address first')}if (_size(user.projects) >= (maxProjects || 5)) {throw new ForbiddenException(`You cannot create more than ${maxProjects} projects on your account plan. Please upgrade to be able to create more projects.`,- );+ )}- this.projectService.validateProject(projectDTO);- await this.projectService.checkIfIDUnique(projectDTO.id);+ this.projectService.validateProject(projectDTO)+ await this.projectService.checkIfIDUnique(projectDTO.id)try {- const project = new Project();- Object.assign(project, projectDTO);- project.origins = _map(projectDTO.origins, _trim);+ const project = new Project()+ Object.assign(project, projectDTO)+ project.origins = _map(projectDTO.origins, _trim)- const newProject = await this.projectService.create(project);- user.projects.push(project);+ const newProject = await this.projectService.create(project)+ user.projects.push(project)- await this.userService.create(user);+ await this.userService.create(user)- return newProject;+ return newProject} catch (e) {if (e.code === 'ER_DUP_ENTRY') {if (e.sqlMessage.includes(projectDTO.id)) {throw new BadRequestException('Project with selected ID already exists',- );+ )}}- throw new BadRequestException(e);+ throw new BadRequestException(e)}}@@ -235,23 +235,23 @@ export class ProjectController {@Param('pid') id: string,@Body() projectDTO: ProjectDTO,): Promise<any> {- this.logger.log({ projectDTO, id }, 'POST /project/admin/:pid');- this.projectService.validateProject(projectDTO);- let project;+ this.logger.log({ projectDTO, id }, 'POST /project/admin/:pid')+ this.projectService.validateProject(projectDTO)+ let project- project = await this.projectService.findOneWithRelations(id);+ project = await this.projectService.findOneWithRelations(id)if (_isEmpty(project)) {- throw new NotFoundException();+ throw new NotFoundException()}- project.active = projectDTO.active;- project.origins = projectDTO.origins;- project.name = projectDTO.name;- project.public = projectDTO.public;+ project.active = projectDTO.active+ project.origins = projectDTO.origins+ project.name = projectDTO.name+ project.public = projectDTO.public- await this.projectService.update(id, project);+ await this.projectService.update(id, project)- const key = getRedisProjectKey(id);+ const key = getRedisProjectKey(id)try {await redis.set(@@ -259,12 +259,12 @@ export class ProjectController {JSON.stringify(project),'EX',redisProjectCacheTimeout,- );+ )} catch {- await redis.del(key);+ await redis.del(key)}- return project;+ return project}@Delete('/admin/:id')@@ -274,7 +274,7 @@ export class ProjectController {@Roles(UserType.ADMIN)@ApiResponse({ status: 204, description: 'Empty body' })async deleteForAdmin(@Param('id') id: string): Promise<any> {- this.logger.log({ id }, 'DELETE /project/admin/:id');+ this.logger.log({ id }, 'DELETE /project/admin/:id')const project = await this.projectService.findOneWhere({ id },@@ -282,23 +282,23 @@ export class ProjectController {relations: ['admin'],select: ['id'],},- );+ )if (_isEmpty(project)) {- throw new NotFoundException(`Project with ID ${id} does not exist`);+ throw new NotFoundException(`Project with ID ${id} does not exist`)}- const query1 = `ALTER table analytics DELETE WHERE pid='${id}'`;- const query2 = `ALTER table customEV DELETE WHERE pid='${id}'`;+ const query1 = `ALTER table analytics DELETE WHERE pid='${id}'`+ const query2 = `ALTER table customEV DELETE WHERE pid='${id}'`try {- await this.projectService.delete(id);- await clickhouse.query(query1).toPromise();- await clickhouse.query(query2).toPromise();- return 'Project deleted successfully';+ await this.projectService.delete(id)+ await clickhouse.query(query1).toPromise()+ await clickhouse.query(query2).toPromise()+ return 'Project deleted successfully'} catch (e) {- this.logger.error(e);- return 'Error while deleting your project';+ this.logger.error(e)+ return 'Error while deleting your project'}}@@ -310,63 +310,63 @@ export class ProjectController {@Body() projectDTO: ProjectDTO,@CurrentUserId() userId: string,): Promise<Project> {- this.logger.log({ projectDTO, userId }, 'POST /project');+ this.logger.log({ projectDTO, userId }, 'POST /project')if (isSelfhosted) {- const projects = await getProjectsClickhouse();+ const projects = await getProjectsClickhouse()- this.projectService.validateProject(projectDTO);- this.projectService.checkIfIDUniqueClickhouse(projects, projectDTO.id);+ this.projectService.validateProject(projectDTO)+ this.projectService.checkIfIDUniqueClickhouse(projects, projectDTO.id)- const project = new Project();- Object.assign(project, projectDTO);- project.origins = _map(projectDTO.origins, _trim);- project.active = true;+ const project = new Project()+ Object.assign(project, projectDTO)+ project.origins = _map(projectDTO.origins, _trim)+ project.active = true- await createProjectClickhouse(project);+ await createProjectClickhouse(project)- return project;+ return project} else {const user = await this.userService.findOneWithRelations(userId, ['projects',- ]);- const maxProjects = ACCOUNT_PLANS[user.planCode]?.maxProjects;+ ])+ const maxProjects = ACCOUNT_PLANS[user.planCode]?.maxProjectsif (!user.isActive) {- throw new ForbiddenException('Please, verify your email address first');+ throw new ForbiddenException('Please, verify your email address first')}if (_size(user.projects) >= (maxProjects || 5)) {throw new ForbiddenException(`You cannot create more than ${maxProjects} projects on your account plan. Please upgrade to be able to create more projects.`,- );+ )}- this.projectService.validateProject(projectDTO);+ this.projectService.validateProject(projectDTO)- await this.projectService.checkIfIDUnique(projectDTO.id);+ await this.projectService.checkIfIDUnique(projectDTO.id)try {- const project = new Project();- Object.assign(project, projectDTO);- project.origins = _map(projectDTO.origins, _trim);+ const project = new Project()+ Object.assign(project, projectDTO)+ project.origins = _map(projectDTO.origins, _trim)- const newProject = await this.projectService.create(project);- user.projects.push(project);+ const newProject = await this.projectService.create(project)+ user.projects.push(project)- await this.userService.create(user);+ await this.userService.create(user)- return newProject;+ return newProject} catch (e) {if (e.code === 'ER_DUP_ENTRY') {if (e.sqlMessage.includes(projectDTO.id)) {throw new BadRequestException('Project with selected ID already exists',- );+ )}}- throw new BadRequestException(e);+ throw new BadRequestException(e)}}}@@ -381,41 +381,41 @@ export class ProjectController {@Body() projectDTO: ProjectDTO,@CurrentUserId() uid: string,): Promise<any> {- this.logger.log({ projectDTO, uid, id }, 'PUT /project/:id');- this.projectService.validateProject(projectDTO);- let project;+ this.logger.log({ projectDTO, uid, id }, 'PUT /project/:id')+ this.projectService.validateProject(projectDTO)+ let projectif (isSelfhosted) {- const project = await getProjectsClickhouse(id);+ const project = await getProjectsClickhouse(id)if (_isEmpty(project)) {- throw new NotFoundException();+ throw new NotFoundException()}- project.active = projectDTO.active;- project.origins = _map(projectDTO.origins, _trim);- project.name = projectDTO.name;- project.public = projectDTO.public;+ project.active = projectDTO.active+ project.origins = _map(projectDTO.origins, _trim)+ project.name = projectDTO.name+ project.public = projectDTO.publicawait updateProjectClickhouse(this.projectService.formatToClickhouse(project),- );+ )} else {- project = await this.projectService.findOneWithRelations(id);+ project = await this.projectService.findOneWithRelations(id)if (_isEmpty(project)) {- throw new NotFoundException();+ throw new NotFoundException()}- this.projectService.allowedToManage(project, uid);+ this.projectService.allowedToManage(project, uid)- project.active = projectDTO.active;- project.origins = _map(projectDTO.origins, _trim);- project.name = projectDTO.name;- project.public = projectDTO.public;+ project.active = projectDTO.active+ project.origins = _map(projectDTO.origins, _trim)+ project.name = projectDTO.name+ project.public = projectDTO.public- await this.projectService.update(id, project);+ await this.projectService.update(id, project)}- const key = getRedisProjectKey(id);+ const key = getRedisProjectKey(id)try {await redis.set(@@ -423,12 +423,12 @@ export class ProjectController {JSON.stringify(project),'EX',redisProjectCacheTimeout,- );+ )} catch {- await redis.del(key);+ await redis.del(key)}- return project;+ return project}@Delete('/:id')@@ -440,25 +440,25 @@ export class ProjectController {@Param('id') id: string,@CurrentUserId() uid: string,): Promise<any> {- this.logger.log({ uid, id }, 'DELETE /project/:id');+ this.logger.log({ uid, id }, 'DELETE /project/:id')if (!isValidPID(id))throw new BadRequestException('The provided Project ID (pid) is incorrect',- );+ )if (isSelfhosted) {- await deleteProjectClickhouse(id);+ await deleteProjectClickhouse(id)- const query1 = `ALTER table analytics DELETE WHERE pid='${id}'`;- const query2 = `ALTER table customEV DELETE WHERE pid='${id}'`;+ const query1 = `ALTER table analytics DELETE WHERE pid='${id}'`+ const query2 = `ALTER table customEV DELETE WHERE pid='${id}'`try {- await clickhouse.query(query1).toPromise();- await clickhouse.query(query2).toPromise();- return 'Project deleted successfully';+ await clickhouse.query(query1).toPromise()+ await clickhouse.query(query2).toPromise()+ return 'Project deleted successfully'} catch (e) {- this.logger.error(e);- return 'Error while deleting your project';+ this.logger.error(e)+ return 'Error while deleting your project'}} else {const project = await this.projectService.findOneWhere(@@ -467,24 +467,24 @@ export class ProjectController {relations: ['admin'],select: ['id'],},- );+ )if (_isEmpty(project)) {- throw new NotFoundException(`Project with ID ${id} does not exist`);+ throw new NotFoundException(`Project with ID ${id} does not exist`)}- this.projectService.allowedToManage(project, uid);+ this.projectService.allowedToManage(project, uid)- const query1 = `ALTER table analytics DELETE WHERE pid='${id}'`;- const query2 = `ALTER table customEV DELETE WHERE pid='${id}'`;+ const query1 = `ALTER table analytics DELETE WHERE pid='${id}'`+ const query2 = `ALTER table customEV DELETE WHERE pid='${id}'`try {- await this.projectService.delete(id);- await clickhouse.query(query1).toPromise();- await clickhouse.query(query2).toPromise();- return 'Project deleted successfully';+ await this.projectService.delete(id)+ await clickhouse.query(query1).toPromise()+ await clickhouse.query(query2).toPromise()+ return 'Project deleted successfully'} catch (e) {- this.logger.error(e);- return 'Error while deleting your project';+ this.logger.error(e)+ return 'Error while deleting your project'}}}