Feature/gap 2152 v2 notifications service

.nvmrc

@@ -1 +1 @@
-16.14.0
+16.14.0

.yarnrc.yml

@@ -1,2 +1,2 @@
 yarnPath: .yarn/releases/yarn-3.6.0.cjs
-nodeLinker: node-modules
+nodeLinker: node-modules

src/app.module.ts

@@ -23,6 +23,8 @@ import { SubscriptionModule } from './subscription/subscription.module';
 import { User } from './user/user.entity';
 import { UserModule } from './user/user.module';
 import { HealthCheckModule } from './healthCheck/healthCheck.module';
+import { v2NotificationsModule } from './notifications/v2/v2notifications.module';
+import { Unsubscribe } from './notifications/v2/unsubscribe/unsubscribe.entity';
 @Module({
     imports: [
         TypeOrmModule.forRootAsync({
@@ -35,6 +37,7 @@ import { HealthCheckModule } from './healthCheck/healthCheck.module';
                         Subscription,
                         User,
                         Newsletter,
+                        Unsubscribe,
                         SavedSearch,
                         SavedSearchNotification,
                     ],
@@ -53,6 +56,7 @@ import { HealthCheckModule } from './healthCheck/healthCheck.module';
         SchedulerModule,
         EmailModule,
         NotificationsModule,
+        v2NotificationsModule,
         SearchModule,
         ContentfulModule,
         EncryptionModule,

src/contentful/contentful.service.ts

@@ -52,7 +52,6 @@ export class ContentfulService {
     }
 
     async updateEntries(contentIds: string[], update: KeyValueMap) {
-        console.log('updating entries');
         const entries = await this.contentfulManagementClient.entry.getMany({
             query: {
                 'sys.id[in]': contentIds.join(','),
@@ -64,7 +63,6 @@ export class ContentfulService {
                 ...entry.fields,
                 ...update,
             };
-            console.log(entry);
 
             const updateResponse =
                 await this.contentfulManagementClient.entry.update(
@@ -74,14 +72,12 @@ export class ContentfulService {
                     entry,
                 );
 
-            console.log('entry updated');
             await this.contentfulManagementClient.entry.publish(
                 {
                     entryId: entry.sys.id,
                 },
                 { sys: updateResponse.sys, fields: {} },
             );
-            console.log('entry published');
         }
     }
 

src/migration/1697725143044-addUnsubscribeReferenceTable.ts

@@ -0,0 +1,16 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class addUnsubscribeReferenceTable1697725143044 implements MigrationInterface {
+    name = 'addUnsubscribeReferenceTable1697725143044'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "unsubscribe" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "subscriptionId" character varying, "newsletterId" character varying, "savedSearchId" integer, "userId" integer, CONSTRAINT "PK_994fd32a0285bbf2fd462a8601d" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`ALTER TABLE "unsubscribe" ADD CONSTRAINT "FK_f051628403f51d0b0e11c1aabf4" FOREIGN KEY ("userId") REFERENCES "gap_user"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "unsubscribe" DROP CONSTRAINT "FK_f051628403f51d0b0e11c1aabf4"`);
+        await queryRunner.query(`DROP TABLE "unsubscribe"`);
+    }
+
+}

src/newsletter/newsletter.controller.spec.ts

@@ -4,6 +4,9 @@ import { NewsletterController } from './newsletter.controller';
 import { Newsletter, NewsletterType } from './newsletter.entity';
 import { NewsletterService } from './newsletter.service';
 import { Response } from 'express';
+import { UnsubscribeService } from '../notifications/v2/unsubscribe/unsubscribe.service';
+import { Unsubscribe } from '../notifications/v2/unsubscribe/unsubscribe.entity';
+import { TypeOrmModule } from '@nestjs/typeorm';
 
 describe('NewsletterController', () => {
     let newsletterController: NewsletterController;
@@ -33,6 +36,12 @@ describe('NewsletterController', () => {
                         deleteByEmailAddressAndType: mockDeleteByEmailAndType,
                     },
                 },
+                {
+                    provide: UnsubscribeService,
+                    useValue: {
+                        Connection: jest.fn(),
+                    },
+                },
             ],
         }).compile();
 
@@ -189,6 +198,7 @@ describe('NewsletterController', () => {
                 '[email protected]',
                 NewsletterType.NEW_GRANTS,
                 response as Response,
+                {},
             );
             expect(mockDeleteByEmailAndType).toBeCalledTimes(1);
             expect(mockDeleteByEmailAndType).toBeCalledWith(
@@ -210,6 +220,7 @@ describe('NewsletterController', () => {
                 '[email protected]',
                 NewsletterType.NEW_GRANTS,
                 response as Response,
+                {},
             );
             expect(mockDeleteByEmailAndType).toBeCalledTimes(1);
             expect(mockDeleteByEmailAndType).toBeCalledWith(

src/newsletter/newsletter.controller.ts

@@ -6,14 +6,19 @@ import {
     Param,
     Body,
     Res,
+    Query,
 } from '@nestjs/common';
 import { NewsletterService } from './newsletter.service';
 import { Response } from 'express';
 import { NewsletterType } from './newsletter.entity';
+import { UnsubscribeService } from '../notifications/v2/unsubscribe/unsubscribe.service';
 
 @Controller('newsletters')
 export class NewsletterController {
-    constructor(private newsletterService: NewsletterService) {}
+    constructor(
+        private newsletterService: NewsletterService,
+        private unsubscribeService: UnsubscribeService,
+    ) {}
 
     @Get()
     async findAll() {
@@ -57,11 +62,25 @@ export class NewsletterController {
         @Param('plainTextEmailAddress') plainTextEmailAddress: string,
         @Param('newsletterType') type: NewsletterType,
         @Res() response: Response,
+        @Query() query: { unsubscribeReference?: string },
     ) {
         const result = await this.newsletterService.deleteByEmailAddressAndType(
             plainTextEmailAddress,
             type,
         );
+        if (query?.unsubscribeReference) {
+            await this.unsubscribeService
+                .deleteOneById(query.unsubscribeReference)
+                .catch((error: unknown) => {
+                    console.error(
+                        `Failed to unsubscribe from unsubscribeReference:
+                            ${
+                                query.unsubscribeReference
+                            }. error:${JSON.stringify(error)}`,
+                    );
+                });
+        }
+
         result == 0 ? response.status(404) : response.status(204);
 
         response.send();

src/newsletter/newsletter.module.ts

@@ -4,11 +4,17 @@ import { NewsletterController } from './newsletter.controller';
 import { Newsletter } from './newsletter.entity';
 import { NewsletterService } from './newsletter.service';
 import { HashModule } from '../hash/hash.module';
-import { UserModule } from 'src/user/user.module';
+import { UserModule } from '../user/user.module';
+import { Unsubscribe } from '../notifications/v2/unsubscribe/unsubscribe.entity';
+import { UnsubscribeService } from '../notifications/v2/unsubscribe/unsubscribe.service';
 
 @Module({
-    imports: [TypeOrmModule.forFeature([Newsletter]), HashModule, UserModule],
-    providers: [NewsletterService],
+    imports: [
+        TypeOrmModule.forFeature([Newsletter, Unsubscribe]),
+        HashModule,
+        UserModule,
+    ],
+    providers: [NewsletterService, UnsubscribeService],
     exports: [NewsletterService],
     controllers: [NewsletterController],
 })

src/notifications/notifications.module.ts

@@ -1,3 +1,4 @@
+import { TypeOrmModule } from '@nestjs/typeorm';
 import { Module } from '@nestjs/common';
 import { NewsletterModule } from 'src/newsletter/newsletter.module';
 import { SavedSearchModule } from 'src/saved_search/saved_search.module';
@@ -7,18 +8,30 @@ import { EmailModule } from '../email/email.module';
 import { GrantModule } from '../grant/grant.module';
 import { SubscriptionModule } from '../subscription/subscription.module';
 import { NotificationsService } from './notifications.service';
+import { NotificationsHelper } from './v2/notifications.helper';
+import { Unsubscribe } from './v2/unsubscribe/unsubscribe.entity';
+import { UnsubscribeService } from './v2/unsubscribe/unsubscribe.service';
+import { UnsubscribeModule } from './v2/unsubscribe/unsubscribe.module';
+import { EncryptionServiceV2 } from 'src/encryption/encryptionV2.service';
 
 @Module({
     imports: [
+        TypeOrmModule.forFeature([Unsubscribe]),
         SubscriptionModule,
         EmailModule,
         GrantModule,
         ContentfulModule,
         NewsletterModule,
         SavedSearchModule,
+        UnsubscribeModule,
         SavedSearchNotificationModule,
     ],
-    providers: [NotificationsService],
+    providers: [
+        NotificationsService,
+        UnsubscribeService,
+        NotificationsHelper,
+        EncryptionServiceV2,
+    ],
     exports: [NotificationsService],
 })
 export class NotificationsModule {}