📈 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
added uploading of extension files to CDN
Yevhenii Kulisidi35e8888b2128
diff --git a/src/marketplace/cdn/cdn.service.ts b/src/marketplace/cdn/cdn.service.tsindex 82e1717ca..15a85d33c 100644--- a/src/marketplace/cdn/cdn.service.ts+++ b/src/marketplace/cdn/cdn.service.ts@@ -1,4 +1,4 @@-import { Injectable } from '@nestjs/common'+import { Injectable, InternalServerErrorException } from '@nestjs/common'import { ConfigService } from '@nestjs/config'import { createReadStream } from 'fs'import { unlink, writeFile } from 'fs/promises'@@ -31,6 +31,7 @@ export class CdnService {return data} catch (error) {console.error(error)+ throw new InternalServerErrorException('Failed to upload extension to the CDN.')}}diff --git a/src/marketplace/extensions/dtos/create-extension.dto.ts b/src/marketplace/extensions/dtos/create-extension.dto.tsindex c236e34a8..e0770816d 100644--- a/src/marketplace/extensions/dtos/create-extension.dto.ts+++ b/src/marketplace/extensions/dtos/create-extension.dto.ts@@ -1,3 +1,4 @@+// TODO: Add validationexport class CreateExtensionBodyDto {readonly name: stringreadonly description?: stringdiff --git a/src/marketplace/extensions/entities/extension.entity.ts b/src/marketplace/extensions/entities/extension.entity.tsindex 0a28bb861..1b2f77b37 100644--- a/src/marketplace/extensions/entities/extension.entity.ts+++ b/src/marketplace/extensions/entities/extension.entity.ts@@ -36,12 +36,8 @@ export class Extension {@Column('varchar', { default: '0.0.1' })version: string- @Column({- type: 'enum',- enum: ExtensionStatus,- default: ExtensionStatus.PENDING, // REVIEW: Should this be PENDING or NO_EXTENSION_UPLOADED?- })- status: string+ @Column({ type: 'enum', enum: ExtensionStatus })+ status: ExtensionStatus@Column({ type: 'int', default: 0 })price: numberdiff --git a/src/marketplace/extensions/extensions.controller.ts b/src/marketplace/extensions/extensions.controller.tsindex 258a36330..7f850258f 100644--- a/src/marketplace/extensions/extensions.controller.ts+++ b/src/marketplace/extensions/extensions.controller.ts@@ -54,6 +54,7 @@ import { ExtensionStatus } from './enums/extension-status.enum'import { JwtAccessTokenGuard } from 'src/auth/guards'import { Auth } from 'src/auth/decorators'import { CreateExtensionBodyDto } from './dtos'+import { CreateExtensionFilesType } from './types'@ApiTags('extensions')@UsePipes(@@ -447,17 +448,13 @@ export class ExtensionsController {],}),)- files: {- mainImage?: Express.Multer.File[]- additionalImages?: Express.Multer.File[]- extensionScript?: Express.Multer.File[]- },+ files: CreateExtensionFilesType,@CurrentUserId() userId: string,): Promise<unknown> {- // TODO: Add upload files to CDNreturn await this.extensionsService.createExtension({ownerId: userId,...body,+ files,})}diff --git a/src/marketplace/extensions/extensions.service.ts b/src/marketplace/extensions/extensions.service.tsindex 5dc2a4874..af034de58 100644--- a/src/marketplace/extensions/extensions.service.ts+++ b/src/marketplace/extensions/extensions.service.ts@@ -10,6 +10,8 @@ import { ISaveExtension } from './interfaces/save-extension.interface'import { User } from '../../user/entities/user.entity'import { IUpdateExtension } from './interfaces/update-extension.interface'import { CreateExtensionType } from './types'+import { ExtensionStatus } from './enums/extension-status.enum'+import { CdnService } from '../cdn/cdn.service'@Injectable()export class ExtensionsService {@@ -20,6 +22,7 @@ export class ExtensionsService {private readonly extensionToProjectRepository: Repository<ExtensionToProject>,@InjectRepository(ExtensionToUser)private readonly extensionToUserRepository: Repository<ExtensionToUser>,+ private readonly cdnService: CdnService,) {}async findOne(options: FindOneOptions<Extension>): Promise<Extension> {@@ -166,7 +169,37 @@ export class ExtensionsService {})}- async createExtension(extension: CreateExtensionType): Promise<Extension> {- return await this.extensionRepository.save(extension)+ async createExtension(extension: CreateExtensionType) {+ return await this.extensionRepository.save({+ ownerId: extension.ownerId,+ name: extension.name,+ description: extension.description,+ status: extension.files.extensionScript+ ? ExtensionStatus.PENDING+ : ExtensionStatus.NO_EXTENSION_UPLOADED,+ price: extension.price,+ mainImage:+ extension.files.mainImage &&+ (+ await this.cdnService.uploadFile(extension.files.mainImage[0])+ ).filename,+ additionalImages: extension.files.additionalImages+ ? [+ ...(await Promise.all(+ extension.files.additionalImages.map(+ async image =>+ (+ await this.cdnService.uploadFile(image)+ ).filename,+ ),+ )),+ ]+ : [],+ fileURL:+ extension.files.extensionScript &&+ (+ await this.cdnService.uploadFile(extension.files.extensionScript[0])+ ).filename,+ })}}diff --git a/src/marketplace/extensions/interfaces/create-extension.interface.ts b/src/marketplace/extensions/interfaces/create-extension.interface.tsindex c92cd2f8b..37b02a650 100644--- a/src/marketplace/extensions/interfaces/create-extension.interface.ts+++ b/src/marketplace/extensions/interfaces/create-extension.interface.ts@@ -1,5 +1,6 @@import { User } from 'src/user/entities/user.entity'import { Category } from '../../categories/category.entity'+import { ExtensionStatus } from '../enums/extension-status.enum'export interface ICreateExtension {name: string@@ -9,7 +10,7 @@ export interface ICreateExtension {price?: numbermainImage?: string | nulladditionalImages?: string[] | []- status?: string+ status?: ExtensionStatusfileURL?: stringcategory?: Category}diff --git a/src/marketplace/extensions/types/create-extension.type.ts b/src/marketplace/extensions/types/create-extension.type.tsindex fdf85c969..853c62319 100644--- a/src/marketplace/extensions/types/create-extension.type.ts+++ b/src/marketplace/extensions/types/create-extension.type.ts@@ -1,4 +1,13 @@-import { Extension } from '../entities/extension.entity'+export type CreateExtensionFilesType = {+ mainImage?: Express.Multer.File[]+ additionalImages?: Express.Multer.File[]+ extensionScript?: Express.Multer.File[]+}-export type CreateExtensionType = Pick<Extension, 'ownerId' | 'name'> &- Partial<Pick<Extension, 'description' | 'price'>>+export type CreateExtensionType = {+ ownerId: string+ name: string+ description?: string+ price?: number+ files: CreateExtensionFilesType+}