diff --git a/.gitignore b/.gitignore index 0c36a93..65bf2b3 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,9 @@ lerna-debug.log* # Deploy secrets *.key app-image.tar.gz + +# Arquivos locais de sessao/briefing - nunca commitar +GEMINI.md +.agy-*.txt +docs/antigravity-cli-playbook.md +docs/relatorio-seguranca-vm.md diff --git a/src/contribution-reports/contribution-reports.service.ts b/src/contribution-reports/contribution-reports.service.ts index 3f1b0c7..254383d 100644 --- a/src/contribution-reports/contribution-reports.service.ts +++ b/src/contribution-reports/contribution-reports.service.ts @@ -4,6 +4,7 @@ import { ForbiddenException, Injectable, NotFoundException, + Logger, } from '@nestjs/common'; import { InjectDataSource } from '@nestjs/typeorm'; import { DataSource } from 'typeorm'; @@ -21,6 +22,8 @@ import { SubmissionStatus } from '../submissions/domain/submission-status.enum'; @Injectable() export class ContributionReportsService { + private readonly logger = new Logger(ContributionReportsService.name); + constructor( @InjectDataSource() private readonly dataSource: DataSource, private readonly notificationsService: NotificationsService, @@ -160,15 +163,24 @@ export class ContributionReportsService { .getRepository(GamificationProfileEntity) .findOne({ where: { id: submission.profileId } }); if (ownerProfile) { - await this.notificationsService.create({ - userId: ownerProfile.userId, - type: NotificationType.CONTRIBUTION_REPORT_UPHELD, - title: 'Contribuição removida', - body: dto.adminNote - ? `Uma contribuição sua foi removida após revisão. Motivo: ${dto.adminNote}` - : 'Uma contribuição sua foi removida após revisão de um report.', - relatedId: submission.id, - }); + try { + await this.notificationsService.create({ + userId: ownerProfile.userId, + type: NotificationType.CONTRIBUTION_REPORT_UPHELD, + title: 'Contribuição removida', + body: dto.adminNote + ? `Uma contribuição sua foi removida após revisão. Motivo: ${dto.adminNote}` + : 'Uma contribuição sua foi removida após revisão de um report.', + relatedId: submission.id, + link: '/submissions', + payload: { submissionId: submission.id }, + }); + } catch (err) { + this.logger.error( + 'Error sending CONTRIBUTION_REPORT_UPHELD notification', + err, + ); + } } } else { await this.dataSource diff --git a/src/database/migrations/1785000000001-UpdateNotificationEntity.ts b/src/database/migrations/1785000000001-UpdateNotificationEntity.ts new file mode 100644 index 0000000..f07873b --- /dev/null +++ b/src/database/migrations/1785000000001-UpdateNotificationEntity.ts @@ -0,0 +1,19 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class UpdateNotificationEntity1785000000001 + implements MigrationInterface +{ + name = 'UpdateNotificationEntity1785000000001'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "notification" ADD "payload" jsonb`); + await queryRunner.query( + `ALTER TABLE "notification" ADD "link" character varying(500)`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "notification" DROP COLUMN "link"`); + await queryRunner.query(`ALTER TABLE "notification" DROP COLUMN "payload"`); + } +} diff --git a/src/database/migrations/1785000000002-UpdateNotificationTypeEnum.ts b/src/database/migrations/1785000000002-UpdateNotificationTypeEnum.ts new file mode 100644 index 0000000..4ac2b27 --- /dev/null +++ b/src/database/migrations/1785000000002-UpdateNotificationTypeEnum.ts @@ -0,0 +1,21 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class UpdateNotificationTypeEnum1785000000002 + implements MigrationInterface +{ + name = 'UpdateNotificationTypeEnum1785000000002'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TYPE "notification_type_enum" ADD VALUE IF NOT EXISTS 'EVENT_UPDATED'`, + ); + await queryRunner.query( + `ALTER TYPE "notification_type_enum" ADD VALUE IF NOT EXISTS 'EVENT_CANCELLED'`, + ); + } + + // eslint-disable-next-line @typescript-eslint/no-unused-vars + public async down(queryRunner: QueryRunner): Promise { + // Postgres does not support removing enum values + } +} diff --git a/src/events/events.module.ts b/src/events/events.module.ts index 55a184f..0b49e22 100644 --- a/src/events/events.module.ts +++ b/src/events/events.module.ts @@ -8,6 +8,7 @@ import { RelationalEventPersistenceModule } from './infrastructure/persistence/r import { UsersModule } from '../users/users.module'; import { MailModule } from '../mail/mail.module'; import { FilesModule } from '../files/files.module'; +import { NotificationsModule } from '../notifications/notifications.module'; @Module({ imports: [ @@ -15,6 +16,7 @@ import { FilesModule } from '../files/files.module'; UsersModule, MailModule, FilesModule, + NotificationsModule, ScheduleModule.forRoot(), ], controllers: [EventsController], diff --git a/src/events/events.service.spec.ts b/src/events/events.service.spec.ts index fb2c9a0..865de17 100644 --- a/src/events/events.service.spec.ts +++ b/src/events/events.service.spec.ts @@ -8,6 +8,7 @@ import { EventsService } from './events.service'; import { EventRepository } from './infrastructure/persistence/event.repository'; import { EventSubscriptionRepository } from './infrastructure/persistence/event-subscription.repository'; import { EventsIcsService } from './events-ics.service'; +import { NotificationsService } from '../notifications/notifications.service'; import { UsersService } from '../users/users.service'; import { MailService } from '../mail/mail.service'; import { FilesService } from '../files/files.service'; @@ -52,6 +53,9 @@ describe('EventsService', () => { let usersService: Partial>; let mailService: Partial>; let filesService: Partial>; + let notificationsService: Partial< + Record + >; beforeEach(() => { repository = { @@ -84,6 +88,9 @@ describe('EventsService', () => { filesService = { remove: jest.fn(), }; + notificationsService = { + create: jest.fn().mockResolvedValue(undefined), + }; service = new EventsService( repository as unknown as EventRepository, @@ -92,6 +99,7 @@ describe('EventsService', () => { usersService as unknown as UsersService, mailService as unknown as MailService, filesService as unknown as FilesService, + notificationsService as unknown as NotificationsService, ); }); diff --git a/src/events/events.service.ts b/src/events/events.service.ts index 98f1b05..18cdf12 100644 --- a/src/events/events.service.ts +++ b/src/events/events.service.ts @@ -5,6 +5,7 @@ import { Injectable, NotFoundException, UnprocessableEntityException, + Logger, } from '@nestjs/common'; import { CreateEventDto } from './dto/create-event.dto'; import { UpdateEventDto } from './dto/update-event.dto'; @@ -21,6 +22,8 @@ import { EventsIcsService } from './events-ics.service'; import { UsersService } from '../users/users.service'; import { MailService } from '../mail/mail.service'; import { FilesService } from '../files/files.service'; +import { NotificationsService } from '../notifications/notifications.service'; +import { NotificationType } from '../notifications/domain/notification-type.enum'; const COVER_IMAGE_RETENTION_MS = 3 * 24 * 60 * 60 * 1000; // 3 dias após o evento @@ -35,6 +38,8 @@ const NOTIFIABLE_FIELD_LABELS: Record = { @Injectable() export class EventsService { + private readonly logger = new Logger(EventsService.name); + constructor( private readonly eventRepository: EventRepository, private readonly eventSubscriptionRepository: EventSubscriptionRepository, @@ -42,6 +47,7 @@ export class EventsService { private readonly usersService: UsersService, private readonly mailService: MailService, private readonly filesService: FilesService, + private readonly notificationsService: NotificationsService, ) {} private validateStartAtNotInPast(startAt?: string) { @@ -219,7 +225,11 @@ export class EventsService { ), ); if (changedFields.length > 0) { - await this.notifySubscribersOfUpdate(updatedEvent, changedFields); + try { + await this.notifySubscribersOfUpdate(updatedEvent, changedFields); + } catch (err) { + this.logger.error('Error notifying subscribers of event update', err); + } } } @@ -290,7 +300,14 @@ export class EventsService { }); if (cancelledEvent) { - await this.notifySubscribersOfCancellation(cancelledEvent); + try { + await this.notifySubscribersOfCancellation(cancelledEvent); + } catch (err) { + this.logger.error( + 'Error notifying subscribers of event cancellation', + err, + ); + } } return cancelledEvent; @@ -329,35 +346,89 @@ export class EventsService { event: Event, changedFields: string[], ): Promise { - const subscriberEmails = await this.getSubscriberEmails(event.id); - if (subscriberEmails.length === 0) return; + const subscriberIds = + await this.eventSubscriptionRepository.findSubscriberUserIds(event.id); + if (subscriberIds.length === 0) return; + + const users = await this.usersService.findByIds(subscriberIds); + if (users.length === 0) return; const changesSummary = `Foi alterado(a): ${changedFields .map((field) => NOTIFIABLE_FIELD_LABELS[field]) .join(', ')}.`; - await Promise.all( - subscriberEmails.map((email) => - this.mailService.eventUpdated({ - to: email, - data: { eventId: event.id, eventTitle: event.title, changesSummary }, - }), - ), + const results = await Promise.allSettled( + users.map(async (user) => { + await this.notificationsService.create({ + userId: user.id as number, + type: NotificationType.EVENT_UPDATED, + title: `Atualização no evento: ${event.title}`, + body: changesSummary, + relatedId: event.id, + link: `/eventos/${event.id}`, + payload: { eventId: event.id }, + }); + + if (user.email) { + await this.mailService.eventUpdated({ + to: user.email, + data: { + eventId: event.id, + eventTitle: event.title, + changesSummary, + }, + }); + } + }), ); + + results.forEach((res, index) => { + if (res.status === 'rejected') { + this.logger.error( + `Error notifying user ${users[index].id} of event update`, + res.reason, + ); + } + }); } private async notifySubscribersOfCancellation(event: Event): Promise { - const subscriberEmails = await this.getSubscriberEmails(event.id); - if (subscriberEmails.length === 0) return; - - await Promise.all( - subscriberEmails.map((email) => - this.mailService.eventCancelled({ - to: email, - data: { eventTitle: event.title }, - }), - ), + const subscriberIds = + await this.eventSubscriptionRepository.findSubscriberUserIds(event.id); + if (subscriberIds.length === 0) return; + + const users = await this.usersService.findByIds(subscriberIds); + if (users.length === 0) return; + + const results = await Promise.allSettled( + users.map(async (user) => { + await this.notificationsService.create({ + userId: user.id as number, + type: NotificationType.EVENT_CANCELLED, + title: `Evento cancelado: ${event.title}`, + body: `O evento "${event.title}" foi cancelado.`, + relatedId: event.id, + link: `/eventos/${event.id}`, + payload: { eventId: event.id }, + }); + + if (user.email) { + await this.mailService.eventCancelled({ + to: user.email, + data: { eventTitle: event.title }, + }); + } + }), ); + + results.forEach((res, index) => { + if (res.status === 'rejected') { + this.logger.error( + `Error notifying user ${users[index].id} of event cancellation`, + res.reason, + ); + } + }); } /** diff --git a/src/legal-documents/legal-documents-notification-cron.service.ts b/src/legal-documents/legal-documents-notification-cron.service.ts index d7c6e7a..68fd3fe 100644 --- a/src/legal-documents/legal-documents-notification-cron.service.ts +++ b/src/legal-documents/legal-documents-notification-cron.service.ts @@ -70,6 +70,8 @@ export class LegalDocumentsNotificationCronService { title: 'Atualizamos nossos termos', body: 'Revisamos a Política de Privacidade e o Termo de Serviço do legado.dev. Dê uma olhada quando puder.', relatedId: 'legal-documents', + link: '/legal', + payload: { version: CURRENT_LEGAL_DOCUMENTS_VERSION }, }); if (user.email) { diff --git a/src/mail/mail-templates/mission-won.hbs b/src/mail/mail-templates/mission-won.hbs new file mode 100644 index 0000000..2f79f1f --- /dev/null +++ b/src/mail/mail-templates/mission-won.hbs @@ -0,0 +1,57 @@ + + + + + + {{title}} + + + + + + +
+ + + + + + + + + + + + + + + +
+

+ legado.dev +

+
+

Parabéns! Você completou a missão {{missionTitle}}.

+ +

Continue o excelente trabalho. Você conquistou {{xp}} XP por esta missão!

+ + + + + +
+ + Ver Voluntariado + +
+
+

+ © {{#if app_name}}{{app_name}}{{else}}legado.dev{{/if}}. Todos os direitos reservados. +

+

+ Este é um e-mail automático, por favor não responda. Você pode ajustar suas preferências de notificação no seu perfil. +

+
+
+ + diff --git a/src/mail/mail-templates/submission-approved.hbs b/src/mail/mail-templates/submission-approved.hbs new file mode 100644 index 0000000..e6ebe86 --- /dev/null +++ b/src/mail/mail-templates/submission-approved.hbs @@ -0,0 +1,57 @@ + + + + + + {{title}} + + + + + + +
+ + + + + + + + + + + + + + + +
+

+ legado.dev +

+
+

Sua submissão para a atividade {{activityTitle}} foi aprovada!

+ +

Obrigado pela sua contribuição. Acesse a plataforma para conferir os detalhes e ver os seus novos pontos.

+ + + + + +
+ + Ver Submissão + +
+
+

+ © {{#if app_name}}{{app_name}}{{else}}legado.dev{{/if}}. Todos os direitos reservados. +

+

+ Este é um e-mail automático, por favor não responda. Você pode ajustar suas preferências de notificação no seu perfil. +

+
+
+ + diff --git a/src/mail/mail.service.ts b/src/mail/mail.service.ts index 76ccb56..c4b6e41 100644 --- a/src/mail/mail.service.ts +++ b/src/mail/mail.service.ts @@ -267,4 +267,67 @@ export class MailService { }, }); } + + async submissionApproved( + mailData: MailData<{ submissionId: string; activityTitle: string }>, + ): Promise { + const url = new URL( + this.configService.getOrThrow('app.frontendDomain', { + infer: true, + }) + `/submissions?open=${mailData.data.submissionId}`, + ); + + await this.mailerService.sendMail({ + to: mailData.to, + subject: `Submissão aprovada: ${mailData.data.activityTitle}`, + text: `${url.toString()} Submissão aprovada: ${mailData.data.activityTitle}`, + templatePath: path.join( + this.configService.getOrThrow('app.workingDirectory', { + infer: true, + }), + 'src', + 'mail', + 'mail-templates', + 'submission-approved.hbs', + ), + context: { + title: `Submissão aprovada: ${mailData.data.activityTitle}`, + url: url.toString(), + activityTitle: mailData.data.activityTitle, + app_name: this.configService.get('app.name', { infer: true }), + }, + }); + } + + async missionWon( + mailData: MailData<{ missionTitle: string; xp: number }>, + ): Promise { + const url = new URL( + this.configService.getOrThrow('app.frontendDomain', { + infer: true, + }) + '/voluntariado', + ); + + await this.mailerService.sendMail({ + to: mailData.to, + subject: `Missão concluída: ${mailData.data.missionTitle}`, + text: `${url.toString()} Missão concluída: ${mailData.data.missionTitle}`, + templatePath: path.join( + this.configService.getOrThrow('app.workingDirectory', { + infer: true, + }), + 'src', + 'mail', + 'mail-templates', + 'mission-won.hbs', + ), + context: { + title: `Missão concluída: ${mailData.data.missionTitle}`, + url: url.toString(), + missionTitle: mailData.data.missionTitle, + xp: mailData.data.xp, + app_name: this.configService.get('app.name', { infer: true }), + }, + }); + } } diff --git a/src/missions/missions.module.ts b/src/missions/missions.module.ts index 581c1b7..9e7b3a1 100644 --- a/src/missions/missions.module.ts +++ b/src/missions/missions.module.ts @@ -5,11 +5,13 @@ import { MissionsService } from './missions.service'; import { MissionEntity } from './infrastructure/persistence/relational/entities/mission.entity'; import { MissionSubmissionEntity } from './infrastructure/persistence/relational/entities/mission-submission.entity'; import { NotificationsModule } from '../notifications/notifications.module'; +import { MailModule } from '../mail/mail.module'; @Module({ imports: [ TypeOrmModule.forFeature([MissionEntity, MissionSubmissionEntity]), NotificationsModule, + MailModule, ], controllers: [MissionsController], providers: [MissionsService], diff --git a/src/missions/missions.service.ts b/src/missions/missions.service.ts index 34d57e2..78da24d 100644 --- a/src/missions/missions.service.ts +++ b/src/missions/missions.service.ts @@ -4,6 +4,7 @@ import { ForbiddenException, Injectable, NotFoundException, + Logger, } from '@nestjs/common'; import { InjectDataSource } from '@nestjs/typeorm'; import { DataSource } from 'typeorm'; @@ -17,12 +18,18 @@ import { MissionSubmissionEntity } from './infrastructure/persistence/relational import { GamificationProfileEntity } from '../gamification-profiles/infrastructure/persistence/relational/entities/gamification-profile.entity'; import { NotificationsService } from '../notifications/notifications.service'; import { NotificationType } from '../notifications/domain/notification-type.enum'; +import { MailService } from '../mail/mail.service'; +import { UserEntity } from '../users/infrastructure/persistence/relational/entities/user.entity'; +import { NotificationPreferenceEntity } from '../notifications/infrastructure/persistence/relational/entities/notification-preference.entity'; @Injectable() export class MissionsService { + private readonly logger = new Logger(MissionsService.name); + constructor( @InjectDataSource() private readonly dataSource: DataSource, private readonly notificationsService: NotificationsService, + private readonly mailService: MailService, ) {} // ── Admin: CRUD ────────────────────────────────────────────────────────────── @@ -251,13 +258,39 @@ export class MissionsService { .getRepository(GamificationProfileEntity) .findOne({ where: { id: submission.profileId } }); if (winnerProfile) { - void this.notificationsService.create({ - userId: winnerProfile.userId, - type: NotificationType.MISSION_WON, - title: 'Você venceu uma missão!', - body: `Parabéns! Sua participação na missão foi aprovada e você ganhou ${mission.xpReward} XP.`, - relatedId: missionId, - }); + void this.notificationsService + .create({ + userId: winnerProfile.userId, + type: NotificationType.MISSION_WON, + title: 'Você venceu uma missão!', + body: `Parabéns! Sua participação na missão foi aprovada e você ganhou ${mission.xpReward} XP.`, + relatedId: missionId, + link: '/voluntariado', + payload: { missionId }, + }) + .catch((err) => + this.logger.error('Error sending MISSION_WON notification', err), + ); + + try { + const user = await this.dataSource + .getRepository(UserEntity) + .findOne({ where: { id: winnerProfile.userId } }); + const pref = await this.dataSource + .getRepository(NotificationPreferenceEntity) + .findOne({ where: { userId: winnerProfile.userId } }); + if (user && user.email && pref?.emailOnMissionWon !== false) { + await this.mailService.missionWon({ + to: user.email, + data: { + missionTitle: mission.title, + xp: mission.xpReward, + }, + }); + } + } catch (err) { + this.logger.error('Error sending missionWon email', err); + } } } diff --git a/src/notifications/domain/notification-type.enum.ts b/src/notifications/domain/notification-type.enum.ts index 8d86154..e9902db 100644 --- a/src/notifications/domain/notification-type.enum.ts +++ b/src/notifications/domain/notification-type.enum.ts @@ -7,4 +7,6 @@ export enum NotificationType { TRACK_MILESTONE_APPROVED = 'TRACK_MILESTONE_APPROVED', TRACK_BADGE_GRANTED = 'TRACK_BADGE_GRANTED', LEGAL_DOCUMENT_UPDATED = 'LEGAL_DOCUMENT_UPDATED', + EVENT_UPDATED = 'EVENT_UPDATED', + EVENT_CANCELLED = 'EVENT_CANCELLED', } diff --git a/src/notifications/infrastructure/persistence/relational/entities/notification.entity.ts b/src/notifications/infrastructure/persistence/relational/entities/notification.entity.ts index ec74f81..44f9698 100644 --- a/src/notifications/infrastructure/persistence/relational/entities/notification.entity.ts +++ b/src/notifications/infrastructure/persistence/relational/entities/notification.entity.ts @@ -32,6 +32,12 @@ export class NotificationEntity { @Column({ type: 'varchar', nullable: true, default: null }) relatedId: string | null; + @Column({ type: 'jsonb', nullable: true, default: null }) + payload: Record | null; + + @Column({ type: 'varchar', length: 500, nullable: true, default: null }) + link: string | null; + @CreateDateColumn() createdAt: Date; } diff --git a/src/notifications/notifications.controller.ts b/src/notifications/notifications.controller.ts index 4cefcb9..d0f01f0 100644 --- a/src/notifications/notifications.controller.ts +++ b/src/notifications/notifications.controller.ts @@ -6,6 +6,7 @@ import { Body, Request, UseGuards, + Query, } from '@nestjs/common'; import { AuthGuard } from '@nestjs/passport'; import { NotificationsService } from './notifications.service'; @@ -19,8 +20,21 @@ export class NotificationsController { constructor(private readonly notificationsService: NotificationsService) {} @Get() - findAll(@Request() req) { - return this.notificationsService.findForUser(req.user.id); + findAll( + @Request() req, + @Query('page') page?: string, + @Query('limit') limit?: string, + @Query('all') all?: string, + ) { + const pageNumber = page ? parseInt(page, 10) : 1; + const limitNumber = limit ? parseInt(limit, 10) : 50; + const allBoolean = all === 'true'; + return this.notificationsService.findForUser( + req.user.id, + pageNumber, + limitNumber, + allBoolean, + ); } @Get('unread-count') diff --git a/src/notifications/notifications.service.ts b/src/notifications/notifications.service.ts index c259601..4deda6c 100644 --- a/src/notifications/notifications.service.ts +++ b/src/notifications/notifications.service.ts @@ -20,6 +20,8 @@ export class NotificationsService { title: string; body: string; relatedId?: string; + payload?: Record; + link?: string; }) { const repo = this.dataSource.getRepository(NotificationEntity); const notification = repo.create({ @@ -28,23 +30,35 @@ export class NotificationsService { title: data.title, body: data.body, relatedId: data.relatedId ?? null, + payload: data.payload ?? null, + link: data.link ?? null, }); return repo.save(notification); } - async findForUser(userId: number) { + async findForUser( + userId: number, + page: number = 1, + limit: number = 50, + all: boolean = false, + ) { const cutoff = new Date(Date.now() - READ_NOTIFICATION_RETENTION_MS); - - return this.dataSource + const query = this.dataSource .getRepository(NotificationEntity) .createQueryBuilder('notification') - .where('notification.userId = :userId', { userId }) - .andWhere( + .where('notification.userId = :userId', { userId }); + + if (!all) { + query.andWhere( '(notification.isRead = false OR (notification.readAt IS NOT NULL AND notification.readAt >= :cutoff))', { cutoff }, - ) + ); + } + + return query .orderBy('notification.createdAt', 'DESC') - .take(50) + .skip((page - 1) * limit) + .take(limit) .getMany(); } diff --git a/src/submissions/submissions.module.ts b/src/submissions/submissions.module.ts index 799bd28..e15c981 100644 --- a/src/submissions/submissions.module.ts +++ b/src/submissions/submissions.module.ts @@ -12,6 +12,7 @@ import { NotificationsModule } from '../notifications/notifications.module'; import { TrackItemsModule } from '../track-items/track-items.module'; import { TrackItemCompletionsModule } from '../track-item-completions/track-item-completions.module'; import { LearningTracksModule } from '../learning-tracks/learning-tracks.module'; +import { MailModule } from '../mail/mail.module'; @Module({ imports: [ @@ -24,6 +25,7 @@ import { LearningTracksModule } from '../learning-tracks/learning-tracks.module' TrackItemsModule, TrackItemCompletionsModule, LearningTracksModule, + MailModule, ], controllers: [SubmissionsController], providers: [SubmissionsService], diff --git a/src/submissions/submissions.service.spec.ts b/src/submissions/submissions.service.spec.ts index a9a69fa..b7a128c 100644 --- a/src/submissions/submissions.service.spec.ts +++ b/src/submissions/submissions.service.spec.ts @@ -3,6 +3,7 @@ import { getDataSourceToken } from '@nestjs/typeorm'; import { BadRequestException, NotFoundException } from '@nestjs/common'; import { SubmissionsService } from './submissions.service'; import { SubmissionRepository } from './infrastructure/persistence/submission.repository'; +import { MailService } from '../mail/mail.service'; import { GamificationProfilesService } from '../gamification-profiles/gamification-profiles.service'; import { ActivitiesService } from '../activities/activities.service'; import { BadgeEvaluatorService } from '../badges/badge-evaluator.service'; @@ -191,6 +192,9 @@ describe('SubmissionsService', () => { mockLearningTracksService = { isSectionReachable: jest.fn().mockResolvedValue(true), }; + const mockMailService = { + submissionApproved: jest.fn(), + }; const module: TestingModule = await Test.createTestingModule({ providers: [ @@ -215,6 +219,7 @@ describe('SubmissionsService', () => { useValue: mockTrackItemCompletionsService, }, { provide: LearningTracksService, useValue: mockLearningTracksService }, + { provide: MailService, useValue: mockMailService }, { provide: getDataSourceToken(), useValue: mockDataSource }, ], }).compile(); diff --git a/src/submissions/submissions.service.ts b/src/submissions/submissions.service.ts index 3cd8b74..b430f71 100644 --- a/src/submissions/submissions.service.ts +++ b/src/submissions/submissions.service.ts @@ -4,6 +4,7 @@ import { Injectable, NotFoundException, UnprocessableEntityException, + Logger, } from '@nestjs/common'; import { InjectDataSource } from '@nestjs/typeorm'; import { DataSource } from 'typeorm'; @@ -32,11 +33,16 @@ import { TrackItemCompletionStatus } from '../track-item-completions/domain/trac import { LearningTracksService } from '../learning-tracks/learning-tracks.service'; import { Activity } from '../activities/domain/activity'; import { PublicSubmissionDetail } from './domain/public-submission-detail'; +import { MailService } from '../mail/mail.service'; +import { UserEntity } from '../users/infrastructure/persistence/relational/entities/user.entity'; +import { NotificationPreferenceEntity } from '../notifications/infrastructure/persistence/relational/entities/notification-preference.entity'; const MODERATOR_REWARD_XP = 3; @Injectable() export class SubmissionsService { + private readonly logger = new Logger(SubmissionsService.name); + constructor( private readonly submissionRepository: SubmissionRepository, private readonly gamificationProfilesService: GamificationProfilesService, @@ -46,6 +52,7 @@ export class SubmissionsService { private readonly trackItemsService: TrackItemsService, private readonly trackItemCompletionsService: TrackItemCompletionsService, private readonly learningTracksService: LearningTracksService, + private readonly mailService: MailService, @InjectDataSource() private readonly dataSource: DataSource, ) {} @@ -559,22 +566,89 @@ export class SubmissionsService { if (ownerProfile) { if (trackItem) { - void this.notificationsService.create({ - userId: ownerProfile.userId, - type: NotificationType.TRACK_MILESTONE_APPROVED, - title: 'Marco de trilha aprovado!', - body: `Sua prova foi aprovada${trackItem.journeyXp > 0 ? ` e você ganhou ${trackItem.journeyXp} XP de Jornada` : ''}.`, - relatedId: id, - }); + void this.notificationsService + .create({ + userId: ownerProfile.userId, + type: NotificationType.TRACK_MILESTONE_APPROVED, + title: 'Marco de trilha aprovado!', + body: `Sua prova foi aprovada${trackItem.journeyXp > 0 ? ` e você ganhou ${trackItem.journeyXp} XP de Jornada` : ''}.`, + relatedId: id, + link: `/trilhas/${trackItem.trackId}/marcos/${trackItem.id}`, + payload: { + trackId: trackItem.trackId, + trackItemId: trackItem.id, + submissionId: id, + }, + }) + .catch((err) => + this.logger.error( + 'Error sending TRACK_MILESTONE_APPROVED notification', + err, + ), + ); } else { - void this.notificationsService.create({ + void this.notificationsService + .create({ + userId: ownerProfile.userId, + type: NotificationType.SUBMISSION_APPROVED, + title: 'Submissão aprovada!', + body: `Sua submissão foi aprovada e você ganhou ${activity.fixedReward} XP.`, + relatedId: id, + link: `/submissions?open=${id}`, + payload: { submissionId: id }, + }) + .catch((err) => + this.logger.error( + 'Error sending SUBMISSION_APPROVED notification', + err, + ), + ); + } + + try { + const user = await this.dataSource + .getRepository(UserEntity) + .findOne({ where: { id: ownerProfile.userId } }); + const pref = await this.dataSource + .getRepository(NotificationPreferenceEntity) + .findOne({ where: { userId: ownerProfile.userId } }); + if (user && user.email && pref?.emailOnSubmissionApproved !== false) { + await this.mailService.submissionApproved({ + to: user.email, + data: { + submissionId: id, + activityTitle: activity.title, + }, + }); + } + } catch (err) { + this.logger.error('Error sending submissionApproved email', err); + } + } + } else if (reviewDto.status === SubmissionStatus.REJECTED) { + const ownerProfile = await this.dataSource + .getRepository(GamificationProfileEntity) + .findOne({ where: { id: submission.profileId } }); + + if (ownerProfile) { + void this.notificationsService + .create({ userId: ownerProfile.userId, - type: NotificationType.SUBMISSION_APPROVED, - title: 'Submissão aprovada!', - body: `Sua submissão foi aprovada e você ganhou ${activity.fixedReward} XP.`, + type: NotificationType.SUBMISSION_REJECTED, + title: 'Submissão rejeitada', + body: reviewDto.feedback + ? `Sua submissão foi rejeitada com o seguinte feedback: ${reviewDto.feedback}` + : 'Sua submissão foi rejeitada.', relatedId: id, - }); - } + link: `/submissions?open=${id}`, + payload: { submissionId: id }, + }) + .catch((err) => + this.logger.error( + 'Error sending SUBMISSION_REJECTED notification', + err, + ), + ); } } diff --git a/src/track-items/track-items.service.ts b/src/track-items/track-items.service.ts index df0db3e..d536bd2 100644 --- a/src/track-items/track-items.service.ts +++ b/src/track-items/track-items.service.ts @@ -3,6 +3,7 @@ import { Injectable, NotFoundException, UnprocessableEntityException, + Logger, } from '@nestjs/common'; import { InjectDataSource } from '@nestjs/typeorm'; import { DataSource } from 'typeorm'; @@ -34,6 +35,8 @@ const AUTO_COMPLETABLE_TYPES = [ @Injectable() export class TrackItemsService { + private readonly logger = new Logger(TrackItemsService.name); + constructor( private readonly trackItemRepository: TrackItemRepository, private readonly trackItemCompletionsService: TrackItemCompletionsService, @@ -283,13 +286,22 @@ export class TrackItemsService { const profile = await this.gamificationProfilesService.findById(profileId); if (profile) { - void this.notificationsService.create({ - userId: profile.userId, - type: NotificationType.TRACK_BADGE_GRANTED, - title: 'Novo selo conquistado!', - body: `Você concluiu a etapa "${section.title}" e ganhou um novo selo.`, - relatedId: section.badgeId, - }); + void this.notificationsService + .create({ + userId: profile.userId, + type: NotificationType.TRACK_BADGE_GRANTED, + title: 'Novo selo conquistado!', + body: `Você concluiu a etapa "${section.title}" e ganhou um novo selo.`, + relatedId: section.badgeId, + link: `/trilhas/${section.trackId}/conquista/${section.id}`, + payload: { trackId: section.trackId, sectionId: section.id }, + }) + .catch((err) => + this.logger.error( + 'Error sending TRACK_BADGE_GRANTED notification', + err, + ), + ); } } }