📈 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 new module as comments for extensions
Yevhenii Kulisidi7dc5ab9afa28
diff --git a/src/analytics/analytics.controller.spec.ts b/src/analytics/analytics.controller.spec.tsindex 463461772..afa824dcd 100644--- a/src/analytics/analytics.controller.spec.ts+++ b/src/analytics/analytics.controller.spec.ts@@ -20,7 +20,7 @@ describe('AnalyticsController', () => {let projectsRepository: Repository<Project>let projectShareRepository: Repository<ProjectShare>let userRepository: Repository<User>-+const USER_REPOSITORY_TOKEN = getRepositoryToken(User)const ACTION_TOKEN_REPOSITORY_TOKEN = getRepositoryToken(ActionToken)const PROJECT_REPOSITORY_TOKEN = getRepositoryToken(Project)@@ -30,18 +30,32 @@ describe('AnalyticsController', () => {const module: TestingModule = await Test.createTestingModule({controllers: [AnalyticsController],providers: [- AnalyticsService,- AppLoggerService,+ AnalyticsService,+ AppLoggerService,TaskManagerService,- ProjectService,+ ProjectService,{provide: PROJECT_REPOSITORY_TOKEN,- useValue: { count: jest.fn(), save: jest.fn(), update: jest.fn(), delete: jest.fn(), findOne: jest.fn(), find: jest.fn() },+ useValue: {+ count: jest.fn(),+ save: jest.fn(),+ update: jest.fn(),+ delete: jest.fn(),+ findOne: jest.fn(),+ find: jest.fn(),+ },},ProjectService,{provide: PROJECT_SHARE_REPOSITORY_TOKEN,- useValue: { count: jest.fn(), save: jest.fn(), update: jest.fn(), delete: jest.fn(), findOne: jest.fn(), find: jest.fn() },+ useValue: {+ count: jest.fn(),+ save: jest.fn(),+ update: jest.fn(),+ delete: jest.fn(),+ findOne: jest.fn(),+ find: jest.fn(),+ },},MailerService,UserService,@@ -52,58 +66,68 @@ describe('AnalyticsController', () => {ActionTokensService,{provide: ACTION_TOKEN_REPOSITORY_TOKEN,- useValue: { delete: jest.fn(), save: jest.fn(), findOneOrFail: jest.fn() },+ useValue: {+ delete: jest.fn(),+ save: jest.fn(),+ findOneOrFail: jest.fn(),+ },},],}).compile()controller = module.get<AnalyticsController>(AnalyticsController)userRepository = module.get<Repository<User>>(USER_REPOSITORY_TOKEN)- actionTokenRepository = module.get<Repository<ActionToken>>(ACTION_TOKEN_REPOSITORY_TOKEN)- projectShareRepository = module.get<Repository<ProjectShare>>(PROJECT_SHARE_REPOSITORY_TOKEN)- projectsRepository = module.get<Repository<Project>>(PROJECT_REPOSITORY_TOKEN)+ actionTokenRepository = module.get<Repository<ActionToken>>(+ ACTION_TOKEN_REPOSITORY_TOKEN,+ )+ projectShareRepository = module.get<Repository<ProjectShare>>(+ PROJECT_SHARE_REPOSITORY_TOKEN,+ )+ projectsRepository = module.get<Repository<Project>>(+ PROJECT_REPOSITORY_TOKEN,+ )})describe('root', () => {it('should be defined controller', () => {expect(controller).toBeDefined()}),- it('should be defined userRepository', () => {- expect(userRepository).toBeDefined()- }),- it('should be defined actionTokenRepository', () => {- expect(actionTokenRepository).toBeDefined()- }),- it('should be defined projectShareRepository', () => {- expect(projectShareRepository).toBeDefined()- }),- it('should be defined projectsRepository', () => {- expect(projectsRepository).toBeDefined()- })+ it('should be defined userRepository', () => {+ expect(userRepository).toBeDefined()+ }),+ it('should be defined actionTokenRepository', () => {+ expect(actionTokenRepository).toBeDefined()+ }),+ it('should be defined projectShareRepository', () => {+ expect(projectShareRepository).toBeDefined()+ }),+ it('should be defined projectsRepository', () => {+ expect(projectsRepository).toBeDefined()+ })})describe('analytics.controller', () => {it('should be defined with getData()', () => {expect(controller.getData).toBeDefined()}),- it('should be defined with getGeneralStats()', () => {- expect(controller.getGeneralStats).toBeDefined()- }),- it('should be defined with getHeartBeatStats()', () => {- expect(controller.getHeartBeatStats).toBeDefined()- }),- it('should be defined with getOverallStats()', () => {- expect(controller.getOverallStats).toBeDefined()- }),- it('should be defined with heartbeat()', () => {- expect(controller.heartbeat).toBeDefined()- }),- it('should be defined with log()', () => {- expect(controller.log).toBeDefined()- }),- it('should be defined with logCustom()', () => {- expect(controller.logCustom).toBeDefined()- }),- it('should be defined with noscript()', () => {- expect(controller.noscript).toBeDefined()- })+ it('should be defined with getGeneralStats()', () => {+ expect(controller.getGeneralStats).toBeDefined()+ }),+ it('should be defined with getHeartBeatStats()', () => {+ expect(controller.getHeartBeatStats).toBeDefined()+ }),+ it('should be defined with getOverallStats()', () => {+ expect(controller.getOverallStats).toBeDefined()+ }),+ it('should be defined with heartbeat()', () => {+ expect(controller.heartbeat).toBeDefined()+ }),+ it('should be defined with log()', () => {+ expect(controller.log).toBeDefined()+ }),+ it('should be defined with logCustom()', () => {+ expect(controller.logCustom).toBeDefined()+ }),+ it('should be defined with noscript()', () => {+ expect(controller.noscript).toBeDefined()+ })})})diff --git a/src/auth/auth.service.spec.ts b/src/auth/auth.service.spec.tsindex 9a3084527..28aa49e54 100644--- a/src/auth/auth.service.spec.ts+++ b/src/auth/auth.service.spec.ts@@ -34,97 +34,97 @@ describe('AuthService', () => {it('should be defined service', () => {expect(service).toBeDefined()}),- it('should be defined repository', () => {- expect(repository).toBeDefined()- })+ it('should be defined repository', () => {+ expect(repository).toBeDefined()+ })}),- describe('auth.service definding', () => {- it('should be defined checkIfPasswordLeaked()', () => {- expect(service.checkIfPasswordLeaked).toBeDefined()- }),- it('should be defined checkPassword()', () => {- expect(service.checkPassword).toBeDefined()- }),- it('should be defined get()', () => {- expect(service.get).toBeDefined()- }),- it('should be defined hashPassword()', () => {- expect(service.hashPassword).toBeDefined()- }),- it('should be defined login()', () => {- expect(service.login).toBeDefined()- }),- it('should be defined postLoginProcess()', () => {- expect(service.postLoginProcess).toBeDefined()- }),- it('should be defined processUser()', () => {- expect(service.processUser).toBeDefined()- }),- it('should be defined sha1hash()', () => {- expect(service.sha1hash).toBeDefined()- }),- it('should be defined validateUser()', () => {- expect(service.validateUser).toBeDefined()- })+ describe('auth.service definding', () => {+ it('should be defined checkIfPasswordLeaked()', () => {+ expect(service.checkIfPasswordLeaked).toBeDefined()+ }),+ it('should be defined checkPassword()', () => {+ expect(service.checkPassword).toBeDefined()+ }),+ it('should be defined get()', () => {+ expect(service.get).toBeDefined()+ }),+ it('should be defined hashPassword()', () => {+ expect(service.hashPassword).toBeDefined()+ }),+ it('should be defined login()', () => {+ expect(service.login).toBeDefined()+ }),+ it('should be defined postLoginProcess()', () => {+ expect(service.postLoginProcess).toBeDefined()+ }),+ it('should be defined processUser()', () => {+ expect(service.processUser).toBeDefined()+ }),+ it('should be defined sha1hash()', () => {+ expect(service.sha1hash).toBeDefined()+ }),+ it('should be defined validateUser()', () => {+ expect(service.validateUser).toBeDefined()+ })- it('should be defined', () => {- expect(repository).toBeDefined()- })+ it('should be defined', () => {+ expect(repository).toBeDefined()+ })- it('should be hashPassword function not null and tobedefined', () => {- let pass = util.getString()- expect(service.hashPassword(pass)).resolves.not.toBeNull()- expect(service.hashPassword).toBeDefined()- })+ it('should be hashPassword function not null and tobedefined', () => {+ let pass = util.getString()+ expect(service.hashPassword(pass)).resolves.not.toBeNull()+ expect(service.hashPassword).toBeDefined()+ })- it('should be get function not null and tobedefined', () => {- let hash = util.getString()- expect(service.get(hash)).resolves.not.toBeNull()- expect(service.get).toBeDefined()- })+ it('should be get function not null and tobedefined', () => {+ let hash = util.getString()+ expect(service.get(hash)).resolves.not.toBeNull()+ expect(service.get).toBeDefined()+ })- it('should be sha1hash function not null and tobedefined', () => {- let string = util.getString()- expect(service.sha1hash(string)).resolves.not.toBeNull()- expect(service.sha1hash).toBeDefined()- })- it('should be checkIfPasswordLeaked function not null and tobedefined', () => {- let pass = util.getString()- expect(service.checkIfPasswordLeaked(pass)).resolves.not.toBeNull()- expect(service.checkIfPasswordLeaked).toBeDefined()- })- it('should be checkPassword function not null and tobedefined', () => {- let passToCheck = util.getString()- let hashedPass = util.getString()- expect(service.checkPassword(passToCheck, hashedPass)).not.toBeNull()- expect(service.checkPassword).toBeDefined()- })+ it('should be sha1hash function not null and tobedefined', () => {+ let string = util.getString()+ expect(service.sha1hash(string)).resolves.not.toBeNull()+ expect(service.sha1hash).toBeDefined()+ })+ it('should be checkIfPasswordLeaked function not null and tobedefined', () => {+ let pass = util.getString()+ expect(service.checkIfPasswordLeaked(pass)).resolves.not.toBeNull()+ expect(service.checkIfPasswordLeaked).toBeDefined()+ })+ it('should be checkPassword function not null and tobedefined', () => {+ let passToCheck = util.getString()+ let hashedPass = util.getString()+ expect(service.checkPassword(passToCheck, hashedPass)).not.toBeNull()+ expect(service.checkPassword).toBeDefined()+ })- it('should be validateUser function not null and tobedefined', () => {- let email = util.getString()- let pass = util.getString()- expect(service.validateUser(email, pass)).rejects.toThrow()- expect(service.validateUser).toBeDefined()- })+ it('should be validateUser function not null and tobedefined', () => {+ let email = util.getString()+ let pass = util.getString()+ expect(service.validateUser(email, pass)).rejects.toThrow()+ expect(service.validateUser).toBeDefined()+ })- it('should be processUser function not null and tobedefined', () => {- let user = util.getUser()- expect(service.processUser(user)).not.toBeNull()- expect(service.processUser).toBeDefined()- })+ it('should be processUser function not null and tobedefined', () => {+ let user = util.getUser()+ expect(service.processUser(user)).not.toBeNull()+ expect(service.processUser).toBeDefined()+ })- it('should be postLoginProcess function not null and tobedefined', () => {- let user = util.getUser()- expect(service.postLoginProcess(user)).not.toBeNull()- expect(service.postLoginProcess).toBeDefined()- })+ it('should be postLoginProcess function not null and tobedefined', () => {+ let user = util.getUser()+ expect(service.postLoginProcess(user)).not.toBeNull()+ expect(service.postLoginProcess).toBeDefined()+ })- it('should be login function not null and tobedefined', () => {- let user = util.getUser()- expect(service.login(user)).not.toBeNull()- expect(service.login).toBeDefined()+ it('should be login function not null and tobedefined', () => {+ let user = util.getUser()+ expect(service.login(user)).not.toBeNull()+ expect(service.login).toBeDefined()+ })})- })// describe('auth.service testing', () => {// it('should return correct hashPassword()', async () => {// const password = 'test'diff --git a/src/logger/logger.service.spec.ts b/src/logger/logger.service.spec.tsindex bbc2a4bff..f577ca12f 100644--- a/src/logger/logger.service.spec.ts+++ b/src/logger/logger.service.spec.ts@@ -14,10 +14,10 @@ describe('AppLoggerService', () => {describe('root', () => {it('should be defined service', () => {- expect(service).toBeDefined()+ expect(service).toBeDefined()}),- it('should be defined log()', () => {+ it('should be defined log()', () => {expect(service.log).toBeDefined()- })+ })})-})\ No newline at end of file+})diff --git a/src/marketplace/comments/comments.controller.spec.ts b/src/marketplace/comments/comments.controller.spec.tsnew file mode 100644index 000000000..cf7a3d430--- /dev/null+++ b/src/marketplace/comments/comments.controller.spec.ts@@ -0,0 +1,18 @@+import { Test, TestingModule } from '@nestjs/testing'+import { CommentsController } from './comments.controller'++describe('CommentsController', () => {+ let controller: CommentsController++ beforeEach(async () => {+ const module: TestingModule = await Test.createTestingModule({+ controllers: [CommentsController],+ }).compile()++ controller = module.get<CommentsController>(CommentsController)+ })++ it('should be defined', () => {+ expect(controller).toBeDefined()+ })+})diff --git a/src/marketplace/comments/comments.controller.ts b/src/marketplace/comments/comments.controller.tsnew file mode 100644index 000000000..7f64958d1--- /dev/null+++ b/src/marketplace/comments/comments.controller.ts@@ -0,0 +1,6 @@+import { Controller } from '@nestjs/common'+import { ApiTags } from '@nestjs/swagger'++@ApiTags('comments')+@Controller('comments')+export class CommentsController {}diff --git a/src/marketplace/comments/comments.module.ts b/src/marketplace/comments/comments.module.tsnew file mode 100644index 000000000..b35c970da--- /dev/null+++ b/src/marketplace/comments/comments.module.ts@@ -0,0 +1,12 @@+import { Module } from '@nestjs/common'+import { TypeOrmModule } from '@nestjs/typeorm'+import { CommentsController } from './comments.controller'+import { CommentsService } from './comments.service'+import { Comment } from './entities/comment.entity'++@Module({+ imports: [TypeOrmModule.forFeature([Comment])],+ controllers: [CommentsController],+ providers: [CommentsService],+})+export class CommentsModule {}diff --git a/src/marketplace/comments/comments.service.spec.ts b/src/marketplace/comments/comments.service.spec.tsnew file mode 100644index 000000000..409d6f13d--- /dev/null+++ b/src/marketplace/comments/comments.service.spec.ts@@ -0,0 +1,18 @@+import { Test, TestingModule } from '@nestjs/testing'+import { CommentsService } from './comments.service'++describe('CommentsService', () => {+ let service: CommentsService++ beforeEach(async () => {+ const module: TestingModule = await Test.createTestingModule({+ providers: [CommentsService],+ }).compile()++ service = module.get<CommentsService>(CommentsService)+ })++ it('should be defined', () => {+ expect(service).toBeDefined()+ })+})diff --git a/src/marketplace/comments/comments.service.ts b/src/marketplace/comments/comments.service.tsnew file mode 100644index 000000000..756071de7--- /dev/null+++ b/src/marketplace/comments/comments.service.ts@@ -0,0 +1,4 @@+import { Injectable } from '@nestjs/common'++@Injectable()+export class CommentsService {}diff --git a/src/marketplace/comments/entities/comment.entity.ts b/src/marketplace/comments/entities/comment.entity.tsnew file mode 100644index 000000000..b6f93818a--- /dev/null+++ b/src/marketplace/comments/entities/comment.entity.ts@@ -0,0 +1,41 @@+import { Extension } from '../../extensions/entities/extension.entity'+import { User } from '../../../user/entities/user.entity'+import {+ Column,+ CreateDateColumn,+ Entity,+ JoinColumn,+ ManyToOne,+ PrimaryGeneratedColumn,+} from 'typeorm'++@Entity()+export class Comment {+ @PrimaryGeneratedColumn()+ id: number++ @Column()+ extensionId: number++ @Column()+ userId: number++ @Column('text', { nullable: true, default: null })+ text: string++ @Column('int', { nullable: true, default: null })+ rating: number++ @CreateDateColumn()+ addedAt: Date++ @ManyToOne(() => Extension, extension => extension.comments, {+ onDelete: 'CASCADE',+ })+ @JoinColumn()+ extension: Extension++ @ManyToOne(() => User, user => user.comments, { onDelete: 'CASCADE' })+ @JoinColumn()+ user: User+}diff --git a/src/marketplace/extensions/entities/extension.entity.ts b/src/marketplace/extensions/entities/extension.entity.tsindex a85b743cb..96f2dc540 100644--- a/src/marketplace/extensions/entities/extension.entity.ts+++ b/src/marketplace/extensions/entities/extension.entity.ts@@ -14,6 +14,7 @@ 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'+import { Comment } from '../../comments/entities/comment.entity'@Entity()export class Extension {@@ -73,4 +74,8 @@ export class Extension {)@JoinTable()projects: ExtensionToProject[]++ @OneToMany(() => Comment, comment => comment.extension)+ @JoinTable()+ comments: Comment[]}diff --git a/src/marketplace/marketplace.module.ts b/src/marketplace/marketplace.module.tsindex 97ea11dee..ecd2000c4 100644--- a/src/marketplace/marketplace.module.ts+++ b/src/marketplace/marketplace.module.ts@@ -2,8 +2,9 @@ import { Module } from '@nestjs/common'import { CategoriesModule } from './categories/categories.module'import { ExtensionsModule } from './extensions/extensions.module'import { CdnModule } from './cdn/cdn.module'+import { CommentsModule } from './comments/comments.module'@Module({- imports: [CategoriesModule, ExtensionsModule, CdnModule],+ imports: [CategoriesModule, ExtensionsModule, CdnModule, CommentsModule],})export class MarketplaceModule {}diff --git a/src/user/entities/user.entity.ts b/src/user/entities/user.entity.tsindex 0042366b8..1959c4031 100644--- a/src/user/entities/user.entity.ts+++ b/src/user/entities/user.entity.ts@@ -11,6 +11,7 @@ import { Project } from '../../project/entity/project.entity'import { ProjectShare } from '../../project/entity/project-share.entity'import { Extension } from '../../marketplace/extensions/entities/extension.entity'import { ExtensionToUser } from '../../marketplace/extensions/entities/extension-to-user.entity'+import { Comment } from '../../marketplace/comments/entities/comment.entity'export enum PlanCode {free = 'free',freelancer = 'freelancer',@@ -185,4 +186,8 @@ export class User {@OneToMany(() => ExtensionToUser, extensionToUser => extensionToUser.user)@JoinTable()extensions: ExtensionToUser[]++ @OneToMany(() => Comment, comment => comment.user)+ @JoinTable()+ comments: Comment[]}