Skip to content

📈 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!

add new request to projects

kruzhambus646299f3a986
diff --git a/src/project/project.controller.ts b/src/project/project.controller.ts
index a2d1d77ce..429268ede 100644
--- a/src/project/project.controller.ts
+++ b/src/project/project.controller.ts
@@ -67,6 +67,52 @@ export class ProjectController {
}
}
+ @Get('/all')
+ @ApiQuery({ name: 'take', required: false })
+ @ApiQuery({ name: 'skip', required: false })
+ @UseGuards(RolesGuard)
+ @Roles(UserType.ADMIN)
+ @ApiResponse({ status: 200, type: Project })
+ async getAllProjects(@Query('take') take: number | undefined, @Query('skip') skip: number | undefined): Promise<Project | object> {
+ this.logger.log({take, skip }, 'GET /project/:id')
+
+ const where = Object()
+ return await this.projectService.paginate({take, skip}, where)
+ }
+
+
+ @Get('/uuid/:id')
+ @ApiQuery({ name: 'take', required: false })
+ @ApiQuery({ name: 'skip', required: false })
+ @ApiQuery({ name: 'relatedonly', required: false, type: Boolean })
+ @ApiResponse({ status: 200, type: [Project] })
+ @UseGuards(RolesGuard)
+ @Roles(UserType.CUSTOMER, UserType.ADMIN)
+ async getUserProject(@Param('id') userId: string, @Query('take') take: number | undefined, @Query('skip') skip: number | undefined): Promise<Pagination<Project> | Project[] | object> {
+ this.logger.log({ userId, take, skip }, 'GET /project')
+ if (isSelfhosted) {
+ 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 paginated = await this.projectService.paginate({ take, skip }, where)
+ const totalMonthlyEvents = await this.projectService.getRedisCount(userId)
+
+ return {
+ ...paginated,
+ totalMonthlyEvents,
+ }
+ }
+ }
+
@Get('/:id')
@ApiResponse({ status: 200, type: Project })
async getOne(@Param('id') id: string, @CurrentUserId() uid: string): Promise<Project | object> {
diff --git a/src/project/project.service.ts b/src/project/project.service.ts
index e31dcace1..9ccc801e7 100644
--- a/src/project/project.service.ts
+++ b/src/project/project.service.ts
@@ -83,7 +83,7 @@ export class ProjectService {
find(params: object): Promise<Project[]> {
return this.projectsRepository.find(params)
}
-
+
findOneWhere(where: Record<string, unknown>, params: object = {}): Promise<Project> {
return this.projectsRepository.findOne({ where, ...params })
}
diff --git a/src/user/dto/update-user.dto.ts b/src/user/dto/update-user.dto.ts
index f90d5c817..c938cfa7a 100644
--- a/src/user/dto/update-user.dto.ts
+++ b/src/user/dto/update-user.dto.ts
@@ -8,4 +8,25 @@ export class UpdateUserProfileDTO {
@ApiProperty({ example: 'your_password123' })
password: string
+
+ @ApiProperty({ example: true })
+ isActive: boolean
+
+ @ApiProperty({ example: 'free' })
+ planCode: string
+
+ @ApiProperty({ example: 'customer' })
+ roles: Array<string>
+
+ @ApiProperty({ example: 'date' })
+ created: string
+
+ @ApiProperty({ example: 'Number' })
+ emailRequests: number
+
+ @ApiProperty({ example: 'reportFrequency' })
+ reportFrequency: string
+
+ @ApiProperty({ example: 'updated' })
+ updated: string
}
diff --git a/src/user/user.controller.ts b/src/user/user.controller.ts
index d5c8ce6bc..7f35efaf9 100644
--- a/src/user/user.controller.ts
+++ b/src/user/user.controller.ts
@@ -109,14 +109,15 @@ export class UserController {
throw new BadRequestException('cancelSubFirst')
}
- const pids = _join(_map(user.projects, el => `'${el.id}'`), ',')
- const query1 = `ALTER table analytics DELETE WHERE pid IN (${pids})`
- const query2 = `ALTER table customEV DELETE WHERE pid IN (${pids})`
-
try {
- await this.projectService.deleteMultiple(pids)
- await clickhouse.query(query1).toPromise()
- await clickhouse.query(query2).toPromise()
+ if (!_isEmpty(user.projects)) {
+ const pids = _join(_map(user.projects, el => `'${el.id}'`), ',')
+ const query1 = `ALTER table analytics DELETE WHERE pid IN (${pids})`
+ const query2 = `ALTER table customEV DELETE WHERE pid IN (${pids})`
+ await this.projectService.deleteMultiple(pids)
+ await clickhouse.query(query1).toPromise()
+ await clickhouse.query(query2).toPromise()
+ }
await this.userService.delete(id)
return 'accountDeleted'
@@ -194,11 +195,10 @@ export class UserController {
const user = await this.userService.findOneWhere({ id })
- if (!user) {
- throw new BadRequestException('User does not exist')
- }
-
try {
+ if (!user) {
+ await this.userService.create({...userDTO})
+ }
await this.userService.update(id, {...user, ...userDTO})
return this.userService.findOneWhere({ id })
} catch (e) {