📈 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
fix update extensions and fix get extensions with status aproved
Maksim Mrug23aa2b3c5616
diff --git a/src/marketplace/extensions/dtos/update-extension.dto.ts b/src/marketplace/extensions/dtos/update-extension.dto.tsindex 2d5549854..9e6767bd8 100644--- a/src/marketplace/extensions/dtos/update-extension.dto.ts+++ b/src/marketplace/extensions/dtos/update-extension.dto.ts@@ -65,4 +65,14 @@ export class UpdateExtension {@IsNumber()@IsOptional()readonly installs?: number++ @ApiProperty({+ default: [],+ description: 'Extension category ID',+ example: 1,+ required: false,+ type: Array<number>,+ })+ @IsOptional()+ readonly categoryID?: number}diff --git a/src/marketplace/extensions/extensions.controller.ts b/src/marketplace/extensions/extensions.controller.tsindex a26ed65c7..6d3c93ddc 100644--- a/src/marketplace/extensions/extensions.controller.ts+++ b/src/marketplace/extensions/extensions.controller.ts@@ -23,6 +23,7 @@ import { ApiParam, ApiQuery, ApiTags } from '@nestjs/swagger'import { getRepository, Like } from 'typeorm'import * as _map from 'lodash/map'import * as _size from 'lodash/size'+import * as _isString from 'lodash/isString'import { CreateExtension } from './dtos/create-extension.dto'import { DeleteExtensionParams } from './dtos/delete-extension-params.dto'import { GetExtensionParams } from './dtos/get-extension-params.dto'@@ -32,7 +33,6 @@ import { UserService } from '../../user/user.service'import { ISaveExtension } from './interfaces/save-extension.interface'import { UpdateExtensionParams } from './dtos/update-extension-params.dto'import { UpdateExtension } from './dtos/update-extension.dto'-import { BodyValidationPipe } from '../common/pipes/body-validation.pipe'import { SearchExtensionQueries } from './dtos/search-extension-queries.dto'import { CategoriesService } from '../categories/categories.service'import { SortByExtension } from './enums/sort-by-extension.enum'@@ -126,12 +126,15 @@ export class ExtensionsController {{skip: queries.offset || 0,take: queries.limit > 100 ? 25 : queries.limit || 25,+ where: {+ status: ExtensionStatus.ACCEPTED,+ },},['owner', 'users', 'category'],)// temporary fix; the usersQuantity should be counted via .count() method of typeorm- extensions = _map(extensions, (extension) => {+ extensions = _map(extensions, extension => {extension.usersQuantity = _size(extension.users)extension.users = undefinedextension.owner = this.extensionsService.filterOwner(extension.owner)@@ -250,6 +253,9 @@ export class ExtensionsController {.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()@@ -262,6 +268,9 @@ export class ExtensionsController {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)@@ -274,6 +283,9 @@ export class ExtensionsController {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)@@ -286,6 +298,7 @@ export class ExtensionsController {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,@@ -387,19 +400,99 @@ export class ExtensionsController {example: 'de025965-3221-4d09-ba35-a09da59793a6',type: String,})+ @UseInterceptors(+ FileFieldsInterceptor([+ { name: 'mainImage', maxCount: 1 },+ { name: 'additionalImages', maxCount: 5 },+ { name: 'file', maxCount: 1 },+ ]),+ )+ @UseGuards(RolesGuard)+ @Roles(UserType.ADMIN || UserType.CUSTOMER)@Patch(':extensionId')async updateExtension(@Param() params: UpdateExtensionParams,+ @Body() body: UpdateExtension,@CurrentUserId() userId: string,- @Body(new BodyValidationPipe()) body: UpdateExtension,- ): Promise<UpdateExtension> {- const { extensionId } = params+ @UploadedFiles()+ files: {+ mainImage?: Express.Multer.File+ additionalImages?: Express.Multer.File[]+ file?: Express.Multer.File+ },+ ): Promise<ISaveExtension & Extension> {+ const extension = await this.extensionsService.findOne({+ where: {+ id: params.extensionId,+ owner: userId,+ },+ })- this.extensionsService.allowedToManage(userId, extensionId)+ if (!extension) {+ throw new NotFoundException('Extension not found.')+ }++ const additionalImageFilenames = []++ if (files.additionalImages) {+ files.additionalImages.map(async additionalImage => {+ if (_isString(additionalImage)) {+ additionalImageFilenames.push(additionalImage)+ } else {+ additionalImageFilenames.push(+ (await this.cdnService.uploadFile(additionalImage))?.filename,+ )+ }+ })+ }- await this.extensionsService.update(extensionId, body)+ let fileURL+ let mainImageURL- return body+ try {+ if (_isString(files.file)) {+ fileURL = files.file+ } else {+ fileURL =+ files.file &&+ (await this.cdnService.uploadFile(files.file[0]))?.filename+ }+ } catch (e) {+ throw new InternalServerErrorException(+ 'Failed to upload extension to the CDN.',+ )+ }++ try {+ if (_isString(files.mainImage)) {+ mainImageURL = files.mainImage+ } else {+ mainImageURL =+ files.mainImage &&+ (await this.cdnService.uploadFile(files.mainImage[0]))?.filename+ }+ } catch (e) {+ throw new InternalServerErrorException(+ 'Failed to upload main image to the CDN.',+ )+ }++ const extensionInstance = {+ ...extension,+ id: params.extensionId,+ name: body.name || extension.name,+ description: body.description || extension.description,+ version: body.version || extension.version,+ price: body.price || extension.price,+ mainImage: mainImageURL || extension.mainImage,+ additionalImages: additionalImageFilenames || extension.additionalImages,+ fileURL: fileURL || extension.fileURL,+ category: body.categoryID+ ? await this.categoriesService.findById(body.categoryID)+ : extension.category,+ }++ return await this.extensionsService.save(extensionInstance)}@ApiParam({diff --git a/src/marketplace/extensions/extensions.service.ts b/src/marketplace/extensions/extensions.service.tsindex 4ce8a0fba..efc612071 100644--- a/src/marketplace/extensions/extensions.service.ts+++ b/src/marketplace/extensions/extensions.service.ts@@ -22,6 +22,7 @@ export class ExtensionsService {) {}async findOne(options: FindOneOptions<Extension>): Promise<Extension> {+ console.log('findOne', options)return await this.extensionRepository.findOne({ ...options })}@@ -127,16 +128,15 @@ export class ExtensionsService {// return this.InstallExtensionRepository.findOne(id, params)// }- async allowedToManage(- ownerId: string,- id: string,- ): Promise<any> {+ async allowedToManage(ownerId: string, id: string): Promise<any> {const extension = await this.findOne({where: { owner: ownerId, id },})if (!extension) {- throw new ForbiddenException('You are not allowed to manage this extension')+ throw new ForbiddenException(+ 'You are not allowed to manage this extension',+ )}}@@ -148,8 +148,8 @@ export class ExtensionsService {return await this.findOne({ where: { id } })}- async update(id: string, extension: IUpdateExtension) {- await this.extensionRepository.update({ id }, extension)+ async update(id: string, extension: IUpdateExtension): Promise<any> {+ return this.extensionRepository.update(id, extension)}async delete(id: string): Promise<void> {diff --git a/src/user/user.service.ts b/src/user/user.service.tsindex 9cbcf9b4d..ae2bce1e7 100644--- a/src/user/user.service.ts+++ b/src/user/user.service.ts@@ -6,7 +6,7 @@ import * as _size from 'lodash/size'import * as _omit from 'lodash/omit'import { Pagination, PaginationOptionsInterface } from '../common/pagination'-import { User } from './entities/user.entity'+import { User, UserType } from './entities/user.entity'import { UserProfileDTO } from './dto/user.dto'@Injectable()@@ -38,6 +38,15 @@ export class UserService {return this.usersRepository.update({ id }, update)}+ // // add function isAdmin+ // isAdmin(id: string): boolean {+ // const user: Promise<User> = this.findOne(id)+ // if (user.roles.includes(UserType.ADMIN)) {+ // return true+ // }+ // return false+ // }+async updateByEmail(email: string,update: Record<string, unknown>,