📈 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
fixed installExtensions, added new column
kruzhambuse3495ebf6d80
diff --git a/src/app.module.ts b/src/app.module.tsindex bbd42199f..38d64bf7c 100644--- a/src/app.module.ts+++ b/src/app.module.ts@@ -22,6 +22,7 @@ import { TGModule } from './tg-integration/tg.module'import { MarketplaceModule } from './marketplace/marketplace.module'import { Category } from './marketplace/categories/category.entity'import { Extension } from './marketplace/extensions/extension.entity'+import { InstallExtension } from './marketplace/extensions/installExtension.entiy'const modules = [ConfigModule.forRoot({ envFilePath: '.env', isGlobal: true }),@@ -33,7 +34,15 @@ const modules = [password: process.env.MYSQL_ROOT_PASSWORD,database: process.env.MYSQL_DATABASE,synchronize: process.env.NODE_ENV === 'development',- entities: [User, Project, ProjectShare, ActionToken, Category, Extension],+ entities: [+ User,+ Project,+ ProjectShare,+ ActionToken,+ Category,+ Extension,+ InstallExtension,+ ],}),ScheduleModule.forRoot(),TaskManagerModule,diff --git a/src/marketplace/extensions/extension.entity.ts b/src/marketplace/extensions/extension.entity.tsindex f987ae43a..4de95acb0 100644--- a/src/marketplace/extensions/extension.entity.ts+++ b/src/marketplace/extensions/extension.entity.ts@@ -4,17 +4,22 @@ import {Entity,JoinTable,ManyToMany,+ ManyToOne,PrimaryGeneratedColumn,UpdateDateColumn,} from 'typeorm'import { Category } from '../categories/category.entity'import { ExtensionStatus } from './enums/extension-status.enum'+import { User } from 'src/user/entities/user.entity'@Entity()export class Extension {@PrimaryGeneratedColumn('uuid')id!: string+ @ManyToOne(() => User, user => user.ownedExtensions)+ owner!: User+@Column('varchar')name: string@@ -47,7 +52,6 @@ export class Extension {updatedAt: Date@ManyToMany(() => Category, category => category.extensions)- @JoinTable()categories: Category[] | []@Column({ type: 'int', default: 0 })diff --git a/src/marketplace/extensions/extensions.controller.ts b/src/marketplace/extensions/extensions.controller.tsindex d36f3d165..b1ae09710 100644--- a/src/marketplace/extensions/extensions.controller.ts+++ b/src/marketplace/extensions/extensions.controller.ts@@ -24,6 +24,7 @@ import { GetExtensionParams } from './dtos/get-extension-params.dto'import { GetAllExtensionsQueries } from './dtos/get-all-extensions-queries.dto'import { InstallExtensionParams } from './dtos/install-extension.dto'import { Extension } from './extension.entity'+import { InstallExtension } from './installExtension.entiy'import { ExtensionsService } from './extensions.service'import { UserService } from '../../user/user.service'import { ISaveExtension } from './interfaces/save-extension.interface'@@ -75,10 +76,13 @@ export class ExtensionsController {extensions: Extension[]count: number}> {- const [extensions, count] = await this.extensionsService.findAndCount({- skip: queries.offset || 0,- take: queries.limit > 100 ? 25 : queries.limit || 25,- })+ const [extensions, count] = await this.extensionsService.findAndCount(+ {+ skip: queries.offset || 0,+ take: queries.limit > 100 ? 25 : queries.limit || 25,+ },+ ['owner'],+ )return { extensions, count }}@@ -252,6 +256,7 @@ export class ExtensionsController {)async createExtension(@Body() body: CreateExtension,+ @CurrentUserId() userId: string,@UploadedFiles()files: {mainImage?: Express.Multer.File@@ -268,11 +273,13 @@ export class ExtensionsController {})}+ const user = await this.userService.findOne(userId)const extensionInstance = this.extensionsService.create({name: body.name,description: body.description,version: body.version,price: body.price,+ owner: user,mainImage: files.mainImage? (await this.cdnService.uploadFile(files.mainImage[0]))?.filename: undefined,@@ -342,8 +349,9 @@ export class ExtensionsController {const user = await this.userService.findOne(userId)- _forEach(user.installExtensions, (installExtension: string) => {- if (installExtension === extension.id) {+ _forEach(user.installExtensions, ({ id }) => {+ console.log(id, 'id')+ if (id === extension.id) {throw new BadRequestException('Extension already installed.')}})@@ -352,16 +360,30 @@ export class ExtensionsController {installs: extension.installs,})- user.installExtensions.push({- id: extension.id,- ...extension,- active: true,- projects: null,- })+ const installExtensionDate = new InstallExtension()+ installExtensionDate.extensionId = extension.id+ installExtensionDate.userId = userId+ installExtensionDate.projects = null+ installExtensionDate.active = true++ const extensionInstallInstance = await this.extensionsService.createInstall(+ installExtensionDate,+ )++ const installExtension = await this.extensionsService.saveInstall(+ extensionInstallInstance,+ )+await this.userService.update(userId, {- installExtensions: user.installExtensions,+ installExtensions: installExtension.id,})- return { user: user, extension: extension }+ const test = await this.userService.findOneWithRelations(userId, [+ 'installExtensions',+ 'installExtensions.extensionId',+ 'installExtensions.projects',+ 'installExtensions.userId',+ ])+ return { user: test, extension }}}diff --git a/src/marketplace/extensions/extensions.module.ts b/src/marketplace/extensions/extensions.module.tsindex 94364e6c7..f11810272 100644--- a/src/marketplace/extensions/extensions.module.ts+++ b/src/marketplace/extensions/extensions.module.ts@@ -4,12 +4,14 @@ import { TypeOrmModule } from '@nestjs/typeorm'import { CategoriesModule } from '../categories/categories.module'import { CdnModule } from '../cdn/cdn.module'import { Extension } from './extension.entity'+import { InstallExtension } from './installExtension.entiy'import { ExtensionsController } from './extensions.controller'import { ExtensionsService } from './extensions.service'@Module({imports: [TypeOrmModule.forFeature([Extension]),+ TypeOrmModule.forFeature([InstallExtension]),CategoriesModule,CdnModule,UserModule,diff --git a/src/marketplace/extensions/extensions.service.ts b/src/marketplace/extensions/extensions.service.tsindex 7c0a2c397..ca5b13b42 100644--- a/src/marketplace/extensions/extensions.service.ts+++ b/src/marketplace/extensions/extensions.service.ts@@ -5,12 +5,15 @@ import { Extension } from './extension.entity'import { ICreateExtension } from './interfaces/create-extension.interface'import { ISaveExtension } from './interfaces/save-extension.interface'import { IUpdateExtension } from './interfaces/update-extension.interface'+import { InstallExtension } from 'src/marketplace/extensions/installExtension.entiy'@Injectable()export class ExtensionsService {constructor(@InjectRepository(Extension)private readonly extensionRepository: Repository<Extension>,+ @InjectRepository(InstallExtension)+ private readonly InstallExtensionRepository: Repository<InstallExtension>,) {}async findOne(options: FindOneOptions<Extension>): Promise<Extension> {@@ -21,6 +24,38 @@ export class ExtensionsService {return this.extensionRepository.create(extension)}+ async createInstall(+ installExtension: InstallExtension,+ ): Promise<InstallExtension> {+ return this.InstallExtensionRepository.create(installExtension)+ }++ async saveInstall(extension: InstallExtension): Promise<InstallExtension> {+ return await this.InstallExtensionRepository.save(extension)+ }++ async updateInstall(+ id: string,+ installExtension: InstallExtension,+ ): Promise<any> {+ return this.InstallExtensionRepository.update(id, installExtension)+ }++ async deleteInstall(id: string): Promise<any> {+ return this.InstallExtensionRepository.delete(id)+ }++ async findInstall(params: object): Promise<InstallExtension[]> {+ return this.InstallExtensionRepository.find(params)+ }++ async findOneInstall(+ id: string,+ params: Object = {},+ ): Promise<InstallExtension | null> {+ return this.InstallExtensionRepository.findOne(id, params)+ }+async save(extension: ISaveExtension): Promise<ISaveExtension & Extension> {return await this.extensionRepository.save(extension)}@@ -39,7 +74,11 @@ export class ExtensionsService {async findAndCount(options: FindManyOptions<Extension>,+ relations: string[] = [],): Promise<[Extension[], number]> {- return await this.extensionRepository.findAndCount({ ...options })+ return await this.extensionRepository.findAndCount({+ ...options,+ relations: relations,+ })}}diff --git a/src/marketplace/extensions/installExtension.entiy.ts b/src/marketplace/extensions/installExtension.entiy.tsnew file mode 100644index 000000000..4c29a21de--- /dev/null+++ b/src/marketplace/extensions/installExtension.entiy.ts@@ -0,0 +1,23 @@+import { Entity, ManyToOne, PrimaryGeneratedColumn, Column } from 'typeorm'+import { Extension } from './extension.entity'+import { User } from 'src/user/entities/user.entity'+import { Project } from 'src/project/entity/project.entity'+@Entity()+export class InstallExtension {+ @PrimaryGeneratedColumn('uuid')+ id: string++ @ManyToOne(() => Extension, extension => extension.id)+ extensionId!: string++ @ManyToOne(() => User, user => user.id)+ userId!: string++ @Column({+ default: true,+ })+ active?: boolean++ @ManyToOne(() => Project, project => project.id)+ projects?: Project[] | null+}diff --git a/src/marketplace/extensions/interfaces/create-extension.interface.ts b/src/marketplace/extensions/interfaces/create-extension.interface.tsindex a4a08b435..0f9b3b01b 100644--- a/src/marketplace/extensions/interfaces/create-extension.interface.ts+++ b/src/marketplace/extensions/interfaces/create-extension.interface.ts@@ -1,9 +1,11 @@+import { User } from 'src/user/entities/user.entity'import { Category } from '../../categories/category.entity'export interface ICreateExtension {name: stringdescription?: string | nullversion: string+ owner: Userprice?: numbermainImage?: string | nulladditionalImages?: string[] | []diff --git a/src/marketplace/extensions/interfaces/create-installExtension.interface.ts b/src/marketplace/extensions/interfaces/create-installExtension.interface.tsnew file mode 100644index 000000000..3d58a4c62--- /dev/null+++ b/src/marketplace/extensions/interfaces/create-installExtension.interface.ts@@ -0,0 +1,4 @@+export default interface ICreateInstallExtension {+ extension: string+ user: string+}diff --git a/src/marketplace/extensions/interfaces/install-extensions.interface.ts b/src/marketplace/extensions/interfaces/install-extensions.interface.tsdeleted file mode 100644index bf285ea0f..000000000--- a/src/marketplace/extensions/interfaces/install-extensions.interface.ts+++ /dev/null@@ -1,15 +0,0 @@-import { Category } from 'src/marketplace/categories/category.entity'--export interface installExtensionsInterfaces {- id: string- active: boolean- name?: string- description?: string | null- version?: string- price?: number- mainImage?: string | null- additionalImages?: string[] | []- categories?: Category[]- installs?: number- projects?: string[] | null-}diff --git a/src/user/entities/user.entity.ts b/src/user/entities/user.entity.tsindex 6385cc16e..f780aa269 100644--- a/src/user/entities/user.entity.ts+++ b/src/user/entities/user.entity.ts@@ -1,15 +1,16 @@-import { installExtensionsInterfaces } from './../../marketplace/extensions/interfaces/install-extensions.interface'import {Entity,Column,PrimaryGeneratedColumn,OneToMany,BeforeUpdate,+ ManyToOne,} from 'typeorm'import { ActionToken } from '../../action-tokens/action-token.entity'import { Project } from '../../project/entity/project.entity'import { ProjectShare } from '../../project/entity/project-share.entity'-+import { Extension } from 'src/marketplace/extensions/extension.entity'+import { InstallExtension } from 'src/marketplace/extensions/installExtension.entiy'export enum PlanCode {free = 'free',freelancer = 'freelancer',@@ -89,6 +90,9 @@ export class User {})planCode: PlanCode+ @Column('varchar', { length: 100 })+ nickname: string+@Column('varchar', { length: 254, unique: true })email: string@@ -156,6 +160,9 @@ export class User {@OneToMany(() => ActionToken, actionToken => actionToken.user)actionTokens: ActionToken[]+ @OneToMany(() => Extension, extension => extension.owner)+ ownedExtensions: Extension[]+@Column({type: 'enum',enum: BillingFrequency,@@ -175,6 +182,6 @@ export class User {})apiKey: string | null- @Column('simple-array')- installExtensions: installExtensionsInterfaces[]+ @ManyToOne(() => InstallExtension, installExtension => installExtension.id)+ installExtensions: InstallExtension[] | []}