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!

added a separate GET endpoint for shared projects

Blue Mousebdcfb7c90740
diff --git a/src/project/project.controller.ts b/src/project/project.controller.ts
index 3975b8802..40b1d1d01 100644
--- a/src/project/project.controller.ts
+++ b/src/project/project.controller.ts
@@ -13,6 +13,7 @@ import {
NotFoundException,
ForbiddenException,
Headers,
+ NotImplementedException,
} from '@nestjs/common'
import { ApiTags, ApiQuery, ApiResponse } from '@nestjs/swagger'
import * as _isEmpty from 'lodash/isEmpty'
@@ -119,6 +120,7 @@ export class ProjectController {
@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)
@@ -136,24 +138,48 @@ export class ProjectController {
{ take, skip },
where,
)
- const shared = await this.projectService.findShare({
- where: {
- user: userId,
- },
- relations: ['project'],
- })
const totalMonthlyEvents = await this.projectService.getRedisCount(
userId,
)
return {
...paginated,
- shared,
totalMonthlyEvents,
}
}
}
+ @Get('/shared')
+ @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 getShared(
+ @CurrentUserId() userId: string,
+ @Query('take') take: number | undefined,
+ @Query('skip') skip: number | undefined,
+ ): Promise<Pagination<ProjectShare> | ProjectShare[] | object> {
+ this.logger.log({ userId, take, skip }, 'GET /project/shared')
+
+ if (isSelfhosted) {
+ throw new NotImplementedException('This feature is not available on selfhosted yet')
+ } else {
+ const where = Object()
+ where.admin = userId
+
+ const paginated = await this.projectService.paginateShared(
+ { take, skip },
+ where,
+ )
+
+ return {
+ ...paginated,
+ }
+ }
+ }
+
@Get('/all')
@ApiQuery({ name: 'take', required: false })
@ApiQuery({ name: 'skip', required: false })
diff --git a/src/project/project.service.ts b/src/project/project.service.ts
index c3aee4029..b3b098f83 100644
--- a/src/project/project.service.ts
+++ b/src/project/project.service.ts
@@ -74,6 +74,24 @@ export class ProjectService {
})
}
+ async paginateShared(options: PaginationOptionsInterface, where: Record<string, unknown> | undefined): Promise<Pagination<ProjectShare>> {
+ const [results, total] = await this.projectShareRepository.findAndCount({
+ take: options.take || 100,
+ skip: options.skip || 0,
+ where,
+ order: {
+ project: 'ASC',
+ },
+ relations: ['project'],
+ })
+
+ return new Pagination<ProjectShare>({
+ // results: processProjectsUser(results),
+ results,
+ total,
+ })
+ }
+
async count(): Promise<number> {
return await this.projectsRepository.count()
}