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 for receiving extensions

Yevhenii Kulisidib1897c3803ae
diff --git a/src/marketplace/extensions/extensions.controller.ts b/src/marketplace/extensions/extensions.controller.ts
index 5ab988e15..3e57e45f2 100644
--- a/src/marketplace/extensions/extensions.controller.ts
+++ b/src/marketplace/extensions/extensions.controller.ts
@@ -120,22 +120,11 @@ export class ExtensionsController {
type: String,
})
@Get()
- async getAllExtensions(@Query() queries: GetAllExtensionsQueries): Promise<{
- extensions: Extension[]
- count: number
- }> {
- let [extensions, count] = await this.extensionsService.findAndCount(
- {
- skip: queries.offset || 0,
- take: queries.limit > 100 ? 25 : queries.limit || 25,
- where: {
- status: ExtensionStatus.ACCEPTED,
- },
- },
- ['owner', 'users', 'category'],
+ async getExtensions(@Query() queries: GetAllExtensionsQueries) {
+ let [extensions, count] = await this.extensionsService.getExtensions(
+ queries,
)
- // temporary fix; the usersQuantity should be counted via .count() method of typeorm
extensions = _map(extensions, extension => {
extension.usersQuantity = _size(extension.users)
extension.users = undefined
@@ -286,9 +275,17 @@ export class ExtensionsController {
})
@Get('search')
async searchExtension(@Query() queries: SearchExtensionQueries) {
- const [extensions, count] = await this.extensionsService.searchExtension(
+ let [extensions, count] = await this.extensionsService.searchExtension(
queries,
)
+
+ extensions = _map(extensions, extension => {
+ extension.usersQuantity = _size(extension.users)
+ extension.users = undefined
+ extension.owner = this.extensionsService.filterOwner(extension.owner)
+ return extension
+ })
+
return { extensions, count }
}
diff --git a/src/marketplace/extensions/extensions.service.ts b/src/marketplace/extensions/extensions.service.ts
index c2b8e0358..e5ad837c9 100644
--- a/src/marketplace/extensions/extensions.service.ts
+++ b/src/marketplace/extensions/extensions.service.ts
@@ -16,6 +16,7 @@ import { UserService } from 'src/user/user.service'
import { ExtensionVersionType } from './dtos'
import { VersionTypes } from './interfaces'
import { SearchExtensionQueries } from './dtos/search-extension-queries.dto'
+import { GetAllExtensionsQueries } from './dtos/get-all-extensions-queries.dto'
@Injectable()
export class ExtensionsService {
@@ -320,6 +321,18 @@ export class ExtensionsService {
updatedAt:
data.sortBy && data.sortBy === 'updatedAt' ? 'DESC' : undefined,
},
+ relations: ['owner', 'users', 'category'],
+ })
+ }
+
+ async getExtensions(data: GetAllExtensionsQueries) {
+ return await this.extensionRepository.findAndCount({
+ skip: data.offset || 0,
+ take: data.limit > 100 ? 100 : data.limit || 10,
+ where: {
+ status: ExtensionStatus.ACCEPTED,
+ },
+ relations: ['owner', 'users', 'category'],
})
}
}