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 image uploading at the creation stage

Yevhenii Kulisidi15837220e3d2
diff --git a/src/marketplace/categories/categories.service.ts b/src/marketplace/categories/categories.service.ts
index cdcd6d90c..3953f4a97 100644
--- a/src/marketplace/categories/categories.service.ts
+++ b/src/marketplace/categories/categories.service.ts
@@ -46,4 +46,8 @@ export class CategoriesService {
async findByName(name: string): Promise<Category> {
return await this.findOne({ where: { name }, select: ['name'] })
}
+
+ async findByIds(ids: number[]): Promise<Category[]> {
+ return await this.categoryRepository.findByIds(ids)
+ }
}
diff --git a/src/marketplace/categories/category.entity.ts b/src/marketplace/categories/category.entity.ts
index 3b7e0fa8e..782153d47 100644
--- a/src/marketplace/categories/category.entity.ts
+++ b/src/marketplace/categories/category.entity.ts
@@ -10,5 +10,5 @@ export class Category {
name!: string
@ManyToMany(() => Extension, extension => extension.categories)
- extensions!: Extension[]
+ extensions!: Extension[] | []
}
diff --git a/src/marketplace/extensions/extension.entity.ts b/src/marketplace/extensions/extension.entity.ts
index 256e772bb..936f6217c 100644
--- a/src/marketplace/extensions/extension.entity.ts
+++ b/src/marketplace/extensions/extension.entity.ts
@@ -34,6 +34,12 @@ export class Extension {
@Column({ type: 'int', default: 0 })
price: number
+ @Column({ type: 'varchar', nullable: true, default: null })
+ mainImage: string | null
+
+ @Column('simple-array')
+ additionalImages: string[] | []
+
@CreateDateColumn()
createdAt: Date
@@ -42,5 +48,5 @@ export class Extension {
@ManyToMany(() => Category, category => category.extensions)
@JoinTable()
- categories!: Category[]
+ categories: Category[] | []
}
diff --git a/src/marketplace/extensions/extensions.controller.ts b/src/marketplace/extensions/extensions.controller.ts
index fa0d8de49..9a74ab68c 100644
--- a/src/marketplace/extensions/extensions.controller.ts
+++ b/src/marketplace/extensions/extensions.controller.ts
@@ -8,9 +8,12 @@ import {
Patch,
Post,
Query,
+ UploadedFiles,
+ UseInterceptors,
UsePipes,
ValidationPipe,
} from '@nestjs/common'
+import { FileFieldsInterceptor } from '@nestjs/platform-express'
import { ApiParam, ApiQuery, ApiTags } from '@nestjs/swagger'
import { getRepository, Like } from 'typeorm'
import { CreateExtension } from './dtos/create-extension.dto'
@@ -24,9 +27,9 @@ 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 { Category } from '../categories/category.entity'
import { CategoriesService } from '../categories/categories.service'
import { SortByExtension } from './enums/sort-by-extension.enum'
+import { CdnService } from '../cdn/cdn.service'
@ApiTags('extensions')
@UsePipes(
@@ -42,6 +45,7 @@ export class ExtensionsController {
constructor(
private readonly extensionsService: ExtensionsService,
private readonly categoriesService: CategoriesService,
+ private readonly cdnService: CdnService,
) {}
@ApiQuery({
@@ -183,23 +187,28 @@ export class ExtensionsController {
}
@Post()
+ @UseInterceptors(
+ FileFieldsInterceptor([
+ { name: 'mainImage', maxCount: 1 },
+ { name: 'additionalImages', maxCount: 5 },
+ ]),
+ )
async createExtension(
@Body() body: CreateExtension,
+ @UploadedFiles()
+ files: {
+ mainImage?: Express.Multer.File
+ additionalImages?: Express.Multer.File[]
+ },
): Promise<ISaveExtension & Extension> {
- const categories: Category[] = []
+ const additionalImageFilenames = []
- if (body.categoriesIds) {
- await Promise.all(
- body.categoriesIds.map(async categoryId => {
- const category = await this.categoriesService.findById(categoryId)
-
- if (!category) {
- throw new NotFoundException('Category not found.')
- }
-
- categories.push(category)
- }),
- )
+ if (files.additionalImages) {
+ files.additionalImages.map(async additionalImage => {
+ additionalImageFilenames.push(
+ (await this.cdnService.uploadFile(additionalImage)).filename,
+ )
+ })
}
const extensionInstance = this.extensionsService.create({
@@ -207,7 +216,13 @@ export class ExtensionsController {
description: body.description,
version: body.version,
price: body.price,
- categories,
+ mainImage: files.mainImage
+ ? (await this.cdnService.uploadFile(files.mainImage[0])).filename
+ : undefined,
+ additionalImages: files.additionalImages ? additionalImageFilenames : [],
+ categories: body.categoriesIds
+ ? await this.categoriesService.findByIds(body.categoriesIds)
+ : undefined,
})
return await this.extensionsService.save(extensionInstance)
diff --git a/src/marketplace/extensions/extensions.module.ts b/src/marketplace/extensions/extensions.module.ts
index 518f90f7f..ae83bed6e 100644
--- a/src/marketplace/extensions/extensions.module.ts
+++ b/src/marketplace/extensions/extensions.module.ts
@@ -1,12 +1,13 @@
import { Module } from '@nestjs/common'
import { TypeOrmModule } from '@nestjs/typeorm'
import { CategoriesModule } from '../categories/categories.module'
+import { CdnModule } from '../cdn/cdn.module'
import { Extension } from './extension.entity'
import { ExtensionsController } from './extensions.controller'
import { ExtensionsService } from './extensions.service'
@Module({
- imports: [TypeOrmModule.forFeature([Extension]), CategoriesModule],
+ imports: [TypeOrmModule.forFeature([Extension]), CategoriesModule, CdnModule],
controllers: [ExtensionsController],
providers: [ExtensionsService],
})
diff --git a/src/marketplace/extensions/interfaces/create-extension.interface.ts b/src/marketplace/extensions/interfaces/create-extension.interface.ts
index 514fd16cc..a4a08b435 100644
--- a/src/marketplace/extensions/interfaces/create-extension.interface.ts
+++ b/src/marketplace/extensions/interfaces/create-extension.interface.ts
@@ -5,5 +5,7 @@ export interface ICreateExtension {
description?: string | null
version: string
price?: number
+ mainImage?: string | null
+ additionalImages?: string[] | []
categories?: Category[]
}
diff --git a/src/marketplace/extensions/interfaces/save-extension.interface.ts b/src/marketplace/extensions/interfaces/save-extension.interface.ts
index 1d4ec0fac..cffa22ff1 100644
--- a/src/marketplace/extensions/interfaces/save-extension.interface.ts
+++ b/src/marketplace/extensions/interfaces/save-extension.interface.ts
@@ -5,5 +5,7 @@ export interface ISaveExtension {
description?: string | null
version: string
price?: number
+ mainImage?: string | null
+ additionalImages?: string[] | []
categories?: Category[]
}