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

kruzhambusf6fa52cdf3de
diff --git a/src/app.module.ts b/src/app.module.ts
index 38d64bf7c..7010e339b 100644
--- a/src/app.module.ts
+++ b/src/app.module.ts
@@ -22,7 +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'
+import { ExtensionToProject } from './marketplace/extensions/extension-to-project.entity'
const modules = [
ConfigModule.forRoot({ envFilePath: '.env', isGlobal: true }),
@@ -41,7 +41,7 @@ const modules = [
ActionToken,
Category,
Extension,
- InstallExtension,
+ ExtensionToProject,
],
}),
ScheduleModule.forRoot(),
diff --git a/src/marketplace/extensions/dtos/install-extension.dto.ts b/src/marketplace/extensions/dtos/install-extension.dto.ts
deleted file mode 100644
index 37bcb42d7..000000000
--- a/src/marketplace/extensions/dtos/install-extension.dto.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { IsString } from 'class-validator'
-
-export class InstallExtensionParams {
- @IsString()
- readonly extensionId!: string
-}
diff --git a/src/marketplace/extensions/extension-to-project.entity.ts b/src/marketplace/extensions/extension-to-project.entity.ts
new file mode 100644
index 000000000..5e6cd3002
--- /dev/null
+++ b/src/marketplace/extensions/extension-to-project.entity.ts
@@ -0,0 +1,24 @@
+import { Project } from 'src/project/entity/project.entity'
+import { Column, Entity, ManyToOne, PrimaryGeneratedColumn } from 'typeorm'
+import { Extension } from './extension.entity'
+
+@Entity()
+export class ExtensionToProject {
+ @PrimaryGeneratedColumn('uuid')
+ id: string
+
+ @Column('uuid')
+ extensionId: string
+
+ @Column('uuid')
+ projectId: string
+
+ @Column('boolean', { default: true })
+ isActive: boolean
+
+ @ManyToOne(() => Extension, extension => extension.extensionToProjects)
+ extension: Extension
+
+ @ManyToOne(() => Project, project => project.extensionToProjects)
+ project: Project
+}
diff --git a/src/marketplace/extensions/extension.entity.ts b/src/marketplace/extensions/extension.entity.ts
index 4de95acb0..4f65432ba 100644
--- a/src/marketplace/extensions/extension.entity.ts
+++ b/src/marketplace/extensions/extension.entity.ts
@@ -5,12 +5,14 @@ import {
JoinTable,
ManyToMany,
ManyToOne,
+ OneToMany,
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'
+import { ExtensionToProject } from './extension-to-project.entity'
@Entity()
export class Extension {
@@ -54,6 +56,15 @@ export class Extension {
@ManyToMany(() => Category, category => category.extensions)
categories: Category[] | []
- @Column({ type: 'int', default: 0 })
- installs: number
+ @OneToMany(
+ () => ExtensionToProject,
+ extensionToProject => extensionToProject.extension,
+ )
+ extensionToProjects: ExtensionToProject[]
+
+ @OneToMany(
+ () => ExtensionToProject,
+ extensionToProject => extensionToProject.project,
+ )
+ projects: ExtensionToProject[]
}
diff --git a/src/marketplace/extensions/extensions.controller.ts b/src/marketplace/extensions/extensions.controller.ts
index b1ae09710..752f266e7 100644
--- a/src/marketplace/extensions/extensions.controller.ts
+++ b/src/marketplace/extensions/extensions.controller.ts
@@ -22,9 +22,7 @@ import { CreateExtension } from './dtos/create-extension.dto'
import { DeleteExtensionParams } from './dtos/delete-extension-params.dto'
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'
@@ -330,60 +328,4 @@ export class ExtensionsController {
await this.extensionsService.delete(extension.id)
}
- @ApiParam({
- name: 'extensionId',
- description: 'Extension ID',
- example: 'de025965-3221-4d09-ba35-a09da59793a6',
- type: String,
- })
- @Get('install/:extensionId')
- async installExtension(
- @Param() params: InstallExtensionParams,
- @CurrentUserId() userId: string,
- ): Promise<{ user: UpdateUserProfileDTO; extension: UpdateExtension }> {
- const extension = await this.extensionsService.findById(params.extensionId)
-
- if (!extension) {
- throw new NotFoundException('Extension not found.')
- }
-
- const user = await this.userService.findOne(userId)
-
- _forEach(user.installExtensions, ({ id }) => {
- console.log(id, 'id')
- if (id === extension.id) {
- throw new BadRequestException('Extension already installed.')
- }
- })
- extension.installs += 1
- await this.extensionsService.update(extension.id, {
- installs: extension.installs,
- })
-
- 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: installExtension.id,
- })
-
- 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.ts
index f11810272..589d00388 100644
--- a/src/marketplace/extensions/extensions.module.ts
+++ b/src/marketplace/extensions/extensions.module.ts
@@ -4,14 +4,13 @@ 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'
+import { ExtensionToProject } from './extension-to-project.entity'
@Module({
imports: [
- TypeOrmModule.forFeature([Extension]),
- TypeOrmModule.forFeature([InstallExtension]),
+ TypeOrmModule.forFeature([Extension, ExtensionToProject]),
CategoriesModule,
CdnModule,
UserModule,
diff --git a/src/marketplace/extensions/extensions.service.ts b/src/marketplace/extensions/extensions.service.ts
index ca5b13b42..f2d50382c 100644
--- a/src/marketplace/extensions/extensions.service.ts
+++ b/src/marketplace/extensions/extensions.service.ts
@@ -5,15 +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'
+import { ExtensionToProject } from './extension-to-project.entity'
@Injectable()
export class ExtensionsService {
constructor(
@InjectRepository(Extension)
private readonly extensionRepository: Repository<Extension>,
- @InjectRepository(InstallExtension)
- private readonly InstallExtensionRepository: Repository<InstallExtension>,
+ @InjectRepository(ExtensionToProject)
+ private readonly extensionToProjectRepository: Repository<ExtensionToProject>,
) {}
async findOne(options: FindOneOptions<Extension>): Promise<Extension> {
@@ -24,37 +24,37 @@ export class ExtensionsService {
return this.extensionRepository.create(extension)
}
- async createInstall(
- installExtension: InstallExtension,
- ): Promise<InstallExtension> {
- return this.InstallExtensionRepository.create(installExtension)
- }
+ // async createInstall(
+ // installExtension: InstallExtension,
+ // ): Promise<InstallExtension> {
+ // return this.InstallExtensionRepository.create(installExtension)
+ // }
- async saveInstall(extension: InstallExtension): Promise<InstallExtension> {
- return await this.InstallExtensionRepository.save(extension)
- }
+ // 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 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 deleteInstall(id: string): Promise<any> {
+ // return this.InstallExtensionRepository.delete(id)
+ // }
- async findInstall(params: object): Promise<InstallExtension[]> {
- return this.InstallExtensionRepository.find(params)
- }
+ // 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 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)
diff --git a/src/marketplace/extensions/installExtension.entiy.ts b/src/marketplace/extensions/installExtension.entiy.ts
deleted file mode 100644
index 4c29a21de..000000000
--- a/src/marketplace/extensions/installExtension.entiy.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-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-installExtension.interface.ts b/src/marketplace/extensions/interfaces/create-installExtension.interface.ts
deleted file mode 100644
index 3d58a4c62..000000000
--- a/src/marketplace/extensions/interfaces/create-installExtension.interface.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default interface ICreateInstallExtension {
- extension: string
- user: string
-}
diff --git a/src/project/entity/project.entity.ts b/src/project/entity/project.entity.ts
index 6d88f4a57..d93e950f0 100644
--- a/src/project/entity/project.entity.ts
+++ b/src/project/entity/project.entity.ts
@@ -1,3 +1,4 @@
+import { ExtensionToProject } from './../../marketplace/extensions/extension-to-project.entity'
import { Entity, Column, PrimaryColumn, ManyToOne, OneToMany } from 'typeorm'
import { ApiProperty } from '@nestjs/swagger'
@@ -49,4 +50,10 @@ export class Project {
@Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
created: Date
+
+ @OneToMany(
+ () => ExtensionToProject,
+ extensionToProject => extensionToProject.project,
+ )
+ extensionToProjects: ExtensionToProject[]
}
diff --git a/src/user/entities/user.entity.ts b/src/user/entities/user.entity.ts
index f780aa269..2e6dd70c0 100644
--- a/src/user/entities/user.entity.ts
+++ b/src/user/entities/user.entity.ts
@@ -4,13 +4,11 @@ import {
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',
@@ -181,7 +179,4 @@ export class User {
default: null,
})
apiKey: string | null
-
- @ManyToOne(() => InstallExtension, installExtension => installExtension.id)
- installExtensions: InstallExtension[] | []
}