📈 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
Entities with the correct relationships were created
Yevhenii Kulisidi55c67ed0c3ca
diff --git a/src/app.module.ts b/src/app.module.tsindex 9e277a423..5568d23aa 100644--- a/src/app.module.ts+++ b/src/app.module.ts@@ -7,22 +7,15 @@ import { TelegrafModule } from 'nestjs-telegraf'import { AuthModule } from './auth/auth.module'import { UserModule } from './user/user.module'import { AnalyticsModule } from './analytics/analytics.module'-import { User } from './user/entities/user.entity'-import { Project } from './project/entity/project.entity'import { ProjectModule } from './project/project.module'import { MailerModule } from './mailer/mailer.module'import { ActionTokensModule } from './action-tokens/action-tokens.module'import { TwoFactorAuthModule } from './twoFactorAuth/twoFactorAuth.module'-import { ActionToken } from './action-tokens/action-token.entity'-import { ProjectShare } from './project/entity/project-share.entity'import { TaskManagerModule } from './task-manager/task-manager.module'import { WebhookModule } from './webhook/webhook.module'import { PingModule } from './ping/ping.module'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/entities/extension.entity'-import { ExtensionToProject } from './marketplace/extensions/entities/extension-to-project.entity'const modules = [ConfigModule.forRoot({ envFilePath: '.env', isGlobal: true }),@@ -34,15 +27,7 @@ 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,- ExtensionToProject,- ],+ entities: [__dirname + '/**/*.entity{.ts,.js}'],}),ScheduleModule.forRoot(),TaskManagerModule,diff --git a/src/marketplace/extensions/entities/extension-to-project.entity.ts b/src/marketplace/extensions/entities/extension-to-project.entity.tsindex 5e6cd3002..fda1e76e0 100644--- a/src/marketplace/extensions/entities/extension-to-project.entity.ts+++ b/src/marketplace/extensions/entities/extension-to-project.entity.ts@@ -1,5 +1,11 @@-import { Project } from 'src/project/entity/project.entity'-import { Column, Entity, ManyToOne, PrimaryGeneratedColumn } from 'typeorm'+import { Project } from '../../../project/entity/project.entity'+import {+ Column,+ Entity,+ JoinColumn,+ ManyToOne,+ PrimaryGeneratedColumn,+} from 'typeorm'import { Extension } from './extension.entity'@Entity()@@ -7,18 +13,20 @@ export class ExtensionToProject {@PrimaryGeneratedColumn('uuid')id: string- @Column('uuid')+ @Column()extensionId: string- @Column('uuid')+ @Column()projectId: string@Column('boolean', { default: true })isActive: boolean- @ManyToOne(() => Extension, extension => extension.extensionToProjects)+ @ManyToOne(() => Extension, extension => extension.projects)+ @JoinColumn()extension: Extension- @ManyToOne(() => Project, project => project.extensionToProjects)+ @ManyToOne(() => Project, project => project.extensions)+ @JoinColumn()project: Project}diff --git a/src/marketplace/extensions/entities/extension-to-user.entity.ts b/src/marketplace/extensions/entities/extension-to-user.entity.tsnew file mode 100644index 000000000..592053111--- /dev/null+++ b/src/marketplace/extensions/entities/extension-to-user.entity.ts@@ -0,0 +1,32 @@+import { User } from '../../../user/entities/user.entity'+import {+ Column,+ Entity,+ JoinColumn,+ ManyToOne,+ PrimaryGeneratedColumn,+} from 'typeorm'+import { Extension } from './extension.entity'++@Entity()+export class ExtensionToUser {+ @PrimaryGeneratedColumn('uuid')+ id: string++ @Column()+ extensionId: string++ @Column()+ userId: string++ @Column('boolean', { default: true })+ isActive: boolean++ @ManyToOne(() => Extension, extension => extension.users)+ @JoinColumn()+ extension: Extension++ @ManyToOne(() => User, user => user.extensions)+ @JoinColumn()+ user: User+}diff --git a/src/marketplace/extensions/entities/extension.entity.ts b/src/marketplace/extensions/entities/extension.entity.tsindex 31cd75a36..a85b743cb 100644--- a/src/marketplace/extensions/entities/extension.entity.ts+++ b/src/marketplace/extensions/entities/extension.entity.ts@@ -2,16 +2,18 @@ import {Column,CreateDateColumn,Entity,+ JoinTable,ManyToMany,ManyToOne,OneToMany,PrimaryGeneratedColumn,UpdateDateColumn,} from 'typeorm'-import { User } from 'src/user/entities/user.entity'-import { ExtensionToProject } from './extension-to-project.entity'+import { User } from '../../../user/entities/user.entity'import { ExtensionStatus } from '../enums/extension-status.enum'import { Category } from '../../categories/category.entity'+import { ExtensionToUser } from './extension-to-user.entity'+import { ExtensionToProject } from './extension-to-project.entity'@Entity()export class Extension {@@ -59,14 +61,16 @@ export class Extension {categories: Category[] | []@OneToMany(- () => ExtensionToProject,- extensionToProject => extensionToProject.extension,+ () => ExtensionToUser,+ extensionToUser => extensionToUser.extension,)- extensionToProjects: ExtensionToProject[]+ @JoinTable()+ users: ExtensionToUser[]@OneToMany(() => ExtensionToProject,- extensionToProject => extensionToProject.project,+ extensionToProject => extensionToProject.extension,)+ @JoinTable()projects: ExtensionToProject[]}diff --git a/src/marketplace/extensions/extensions.module.ts b/src/marketplace/extensions/extensions.module.tsindex c9901d732..97deb113f 100644--- a/src/marketplace/extensions/extensions.module.ts+++ b/src/marketplace/extensions/extensions.module.ts@@ -7,10 +7,11 @@ import { ExtensionsController } from './extensions.controller'import { ExtensionsService } from './extensions.service'import { Extension } from './entities/extension.entity'import { ExtensionToProject } from './entities/extension-to-project.entity'+import { ExtensionToUser } from './entities/extension-to-user.entity'@Module({imports: [- TypeOrmModule.forFeature([Extension, ExtensionToProject]),+ TypeOrmModule.forFeature([Extension, ExtensionToUser, ExtensionToProject]),CategoriesModule,CdnModule,UserModule,diff --git a/src/project/entity/project.entity.ts b/src/project/entity/project.entity.tsindex af4603eb8..d8c25cf4a 100644--- a/src/project/entity/project.entity.ts+++ b/src/project/entity/project.entity.ts@@ -1,9 +1,16 @@-import { Entity, Column, PrimaryColumn, ManyToOne, OneToMany } from 'typeorm'+import {+ Entity,+ Column,+ PrimaryColumn,+ ManyToOne,+ OneToMany,+ JoinTable,+} from 'typeorm'import { ApiProperty } from '@nestjs/swagger'import { User } from '../../user/entities/user.entity'import { ProjectShare } from './project-share.entity'-import { ExtensionToProject } from 'src/marketplace/extensions/entities/extension-to-project.entity'+import { ExtensionToProject } from '../../marketplace/extensions/entities/extension-to-project.entity'// In case of modifying some properties here, make sure to also edit them in common/constants.ts -> selfhosted -> clickhouse// and to add them to the GDPR data export email template@@ -55,5 +62,6 @@ export class Project {() => ExtensionToProject,extensionToProject => extensionToProject.project,)- extensionToProjects: ExtensionToProject[]+ @JoinTable()+ extensions: ExtensionToProject[]}diff --git a/src/user/entities/user.entity.ts b/src/user/entities/user.entity.tsindex a4e49efe4..0042366b8 100644--- a/src/user/entities/user.entity.ts+++ b/src/user/entities/user.entity.ts@@ -4,11 +4,13 @@ import {PrimaryGeneratedColumn,OneToMany,BeforeUpdate,+ JoinTable,} 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/entities/extension.entity'+import { Extension } from '../../marketplace/extensions/entities/extension.entity'+import { ExtensionToUser } from '../../marketplace/extensions/entities/extension-to-user.entity'export enum PlanCode {free = 'free',freelancer = 'freelancer',@@ -179,4 +181,8 @@ export class User {default: null,})apiKey: string | null++ @OneToMany(() => ExtensionToUser, extensionToUser => extensionToUser.user)+ @JoinTable()+ extensions: ExtensionToUser[]}