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!

fixed the route to search for extensions

Yevhenii Kulisidi5161451d1e53
diff --git a/src/marketplace/extensions/extensions.controller.ts b/src/marketplace/extensions/extensions.controller.ts
index 1a6fa88c9..5ab988e15 100644
--- a/src/marketplace/extensions/extensions.controller.ts
+++ b/src/marketplace/extensions/extensions.controller.ts
@@ -285,67 +285,10 @@ export class ExtensionsController {
type: String,
})
@Get('search')
- async searchExtension(@Query() queries: SearchExtensionQueries): Promise<{
- extensions: Extension[]
- count: number
- }> {
- if (queries.category) {
- const [extensions, count] = await getRepository(Extension)
- .createQueryBuilder('extension')
- .leftJoin('extension.category', 'category')
- .where('extension.name LIKE :term', { term: `%${queries.term}%` })
- .andWhere('category.name = :category', { category: queries.category })
- .andWhere('extension.status = :status', {
- status: ExtensionStatus.ACCEPTED,
- })
- .skip(queries.offset || 0)
- .take(queries.limit > 100 ? 25 : queries.limit || 25)
- .getManyAndCount()
-
- return { extensions, count }
- }
-
- if (queries.sortBy) {
- if (queries.sortBy === SortByExtension.CREATED_AT) {
- const [extensions, count] = await getRepository(Extension)
- .createQueryBuilder('extension')
- .where('extension.name LIKE :term', { term: `%${queries.term}%` })
- .andWhere('extension.status = :status', {
- status: ExtensionStatus.ACCEPTED,
- })
- .orderBy('extension.createdAt', 'DESC')
- .skip(queries.offset || 0)
- .take(queries.limit > 100 ? 25 : queries.limit || 25)
- .getManyAndCount()
-
- return { extensions, count }
- }
-
- if (queries.sortBy === SortByExtension.UPDATED_AT) {
- const [extensions, count] = await getRepository(Extension)
- .createQueryBuilder('extension')
- .where('extension.name LIKE :term', { term: `%${queries.term}%` })
- .andWhere('extension.status = :status', {
- status: ExtensionStatus.ACCEPTED,
- })
- .orderBy('extension.updatedAt', 'DESC')
- .skip(queries.offset || 0)
- .take(queries.limit > 100 ? 25 : queries.limit || 25)
- .getManyAndCount()
-
- return { extensions, count }
- }
- }
-
- const [extensions, count] = await this.extensionsService.findAndCount({
- where: {
- name: Like(`%${queries.term}%`),
- status: ExtensionStatus.ACCEPTED,
- },
- skip: queries.offset || 0,
- take: queries.limit > 100 ? 25 : queries.limit || 25,
- })
-
+ async searchExtension(@Query() queries: SearchExtensionQueries) {
+ const [extensions, count] = await this.extensionsService.searchExtension(
+ queries,
+ )
return { extensions, count }
}
diff --git a/src/marketplace/extensions/extensions.service.ts b/src/marketplace/extensions/extensions.service.ts
index 1dd71752e..c2b8e0358 100644
--- a/src/marketplace/extensions/extensions.service.ts
+++ b/src/marketplace/extensions/extensions.service.ts
@@ -1,7 +1,7 @@
import { ForbiddenException, Injectable } from '@nestjs/common'
import * as _pick from 'lodash/pick'
import { InjectRepository } from '@nestjs/typeorm'
-import { FindManyOptions, FindOneOptions, Repository } from 'typeorm'
+import { FindManyOptions, FindOneOptions, Like, Repository } from 'typeorm'
import { ExtensionToProject } from './entities/extension-to-project.entity'
import { ExtensionToUser } from './entities/extension-to-user.entity'
import { Extension } from './entities/extension.entity'
@@ -15,6 +15,7 @@ import { CdnService } from '../cdn/cdn.service'
import { UserService } from 'src/user/user.service'
import { ExtensionVersionType } from './dtos'
import { VersionTypes } from './interfaces'
+import { SearchExtensionQueries } from './dtos/search-extension-queries.dto'
@Injectable()
export class ExtensionsService {
@@ -305,4 +306,20 @@ export class ExtensionsService {
return newVersion
}
+
+ async searchExtension(data: SearchExtensionQueries) {
+ return await this.extensionRepository.findAndCount({
+ skip: data.offset || 0,
+ take: data.limit > 100 ? 100 : data.limit || 10,
+ where: {
+ name: Like(`%${data.term}%`),
+ },
+ order: {
+ createdAt:
+ data.sortBy && data.sortBy === 'createdAt' ? 'DESC' : undefined,
+ updatedAt:
+ data.sortBy && data.sortBy === 'updatedAt' ? 'DESC' : undefined,
+ },
+ })
+ }
}