📈 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
modify: update, get, create for captcha projects
kruzhambus6deeb046ca74
diff --git a/src/project/dto/project.dto.ts b/src/project/dto/project.dto.tsindex e80e4e971..27f740365 100644--- a/src/project/dto/project.dto.ts+++ b/src/project/dto/project.dto.ts@@ -46,4 +46,10 @@ export class ProjectDTO {"When true, anyone on the internet (including Google) would be able to see the project's Dashboard.",})public: boolean++ @ApiProperty({+ required: false,+ description: 'When true, created a new Captcha Project without Analytics Projects.'+ })+ isCaptcha: boolean}diff --git a/src/project/entity/project.entity.ts b/src/project/entity/project.entity.tsindex 8c6081b63..91ede5070 100644--- a/src/project/entity/project.entity.ts+++ b/src/project/entity/project.entity.ts@@ -69,4 +69,13 @@ export class Project {)@JoinTable()extensions: ExtensionToProject[]++ @Column({ default: true })+ isAnalyticsProject: boolean++ @Column({ default: false})+ isCaptchaProject: boolean++ @Column({ default: false})+ isCaptchaEnabled: boolean}diff --git a/src/project/project.controller.ts b/src/project/project.controller.tsindex 702389ec9..5d6741687 100644--- a/src/project/project.controller.ts+++ b/src/project/project.controller.ts@@ -22,6 +22,7 @@ import * as _trim from 'lodash/trim'import * as _size from 'lodash/size'import * as _includes from 'lodash/includes'import * as _omit from 'lodash/omit'+import * as _filter from 'lodash/filter'import { ProjectService, processProjectUser, deleteProjectRedis } from './project.service'import { UserType, ACCOUNT_PLANS, PlanCode } from '../user/entities/user.entity'@@ -80,6 +81,7 @@ export class ProjectController {@Get('/')@ApiQuery({ name: 'take', required: false })@ApiQuery({ name: 'skip', required: false })+ @ApiQuery({ name: 'isCaptcha', required: false, type: Boolean })@ApiQuery({ name: 'relatedonly', required: false, type: Boolean })@ApiResponse({ status: 200, type: [Project] })@Auth([UserType.CUSTOMER, UserType.ADMIN], true)@@ -87,6 +89,7 @@ export class ProjectController {@CurrentUserId() userId: string,@Query('take') take: number | undefined,@Query('skip') skip: number | undefined,+ @Query('isCaptcha') isCaptcha: boolean | undefined,): Promise<Pagination<Project> | Project[] | object> {this.logger.log({ userId, take, skip }, 'GET /project')@@ -103,10 +106,17 @@ export class ProjectController {const where = Object()where.admin = userId+ if (isCaptcha) {+ where.isCaptchaProject = true+ } else {+ where.isAnalyticsProject = true+ }+const paginated = await this.projectService.paginate({ take, skip },where,)+const totalMonthlyEvents = await this.projectService.getRedisCount(userId)paginated.results = _map(paginated.results, p => ({@@ -332,10 +342,18 @@ export class ProjectController {)}- if (_size(user.projects) >= (maxProjects || PROJECTS_MAXIMUM)) {- throw new ForbiddenException(- `You cannot create more than ${maxProjects} projects on your account plan. Please upgrade to be able to create more projects.`,- )+ if (projectDTO.isCaptcha) {+ if (_size(_filter(user.projects, (project: Project) => project.isCaptchaProject) >= (maxProjects || PROJECTS_MAXIMUM))) {+ throw new ForbiddenException(+ `You cannot create more than ${maxProjects} projects on your account plan. Please upgrade to be able to create more projects.`,+ )+ }+ } else {+ if (_size(_filter(user.projects, (project: Project) => project.isAnalyticsProject) >= (maxProjects || PROJECTS_MAXIMUM))) {+ 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)@@ -347,6 +365,12 @@ export class ProjectController {Object.assign(project, projectDTO)project.origins = _map(projectDTO.origins, _trim)+ if (projectDTO.isCaptcha) {+ project.isCaptchaProject = true+ project.isAnalyticsProject = false+ project.isCaptchaEnabled = true+ }+const newProject = await this.projectService.create(project)user.projects.push(project)@@ -472,6 +496,21 @@ export class ProjectController {project.name = projectDTO.nameproject.public = projectDTO.public+ if (project.isAnalyticsProject && projectDTO.isCaptcha) {+ const captchaProjects = _filter(user.projects, (project: Project) => project.isCaptchaProject)+ const maxProjects = ACCOUNT_PLANS[user.planCode]?.maxProjects+++ if (_size(captchaProjects >= (maxProjects || PROJECTS_MAXIMUM))) {+ throw new ForbiddenException(+ `You cannot create more than ${maxProjects} projects on your account plan. Please upgrade to be able to create more projects.`,+ )+ }++ project.isCaptchaProject = true+ project.isCaptchaEnabled = true+ }+await this.projectService.update(id, _omit(project, ['share', 'admin']))}