Refactor/Ban-113-Notifications-Gate

apps/business/Jenkinsfile

@@ -3,13 +3,13 @@ pipeline {
     agent any
     environment {
         ENV_TYPE = "production"
-        PORT = 3986
+        PORT = 4052
         NAMESPACE = "yogram-ru"
         REGISTRY_HOSTNAME = "idogmat"
-        PROJECT = "business"
+        PROJECT = "yogram-business"
         SERVICE="business"
         REGISTRY = "registry.hub.docker.com"
-        DEPLOYMENT_NAME = "business-deployment"
+        DEPLOYMENT_NAME = "yogram-business-deployment"
         IMAGE_NAME = "${env.BUILD_ID}_${env.ENV_TYPE}_${env.GIT_COMMIT}"
         DOCKER_BUILD_NAME = "${env.REGISTRY_HOSTNAME}/${env.PROJECT}:${env.IMAGE_NAME}"
     }

apps/business/deployment.yaml

@@ -22,63 +22,63 @@ spec:
             - containerPort: PORT_CONTAINER
 
           env:
-            - name: POSTGRES_TYPE
-              valueFrom:
-                secretKeyRef:
-                  name: business-production-config-secret
-                  key: POSTGRES_TYPE
-            - name: BUSINESS_SERVICE_URL
-              valueFrom:
-                secretKeyRef:
-                  name: business-production-config-secret
-                  key: BUSINESS_SERVICE_URL
-            - name: POSTGRES_URL_SLAVE
-              valueFrom:
-                secretKeyRef:
-                  name: business-production-config-secret
-                  key: POSTGRES_URL_SLAVE
-            - name: PAYPAL_CLIENT_ID
-              valueFrom:
-                secretKeyRef:
-                  name: business-production-config-secret
-                  key: PAYPAL_CLIENT_ID
             - name: PAYPAL_SECRET
               valueFrom:
                 secretKeyRef:
-                  name: business-production-config-secret
+                  name: yogram-business-production-config-secret
                   key: PAYPAL_SECRET
             - name: USERS_SERVICE_URL
               valueFrom:
                 secretKeyRef:
-                  name: business-production-config-secret
+                  name: yogram-business-production-config-secret
                   key: USERS_SERVICE_URL
-            - name: REDIS_USER
-              valueFrom:
-                secretKeyRef:
-                  name: business-production-config-secret
-                  key: REDIS_USER
             - name: REDIS_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: business-production-config-secret
+                  name: yogram-business-production-config-secret
                   key: REDIS_PASSWORD
             - name: REDIS_HOST
               valueFrom:
                 secretKeyRef:
-                  name: business-production-config-secret
+                  name: yogram-business-production-config-secret
                   key: REDIS_HOST
             - name: REDIS_PORT
               valueFrom:
                 secretKeyRef:
-                  name: business-production-config-secret
+                  name: yogram-business-production-config-secret
                   key: REDIS_PORT
             - name: TIME_PERIOD
               valueFrom:
                 secretKeyRef:
-                  name: business-production-config-secret
+                  name: yogram-business-production-config-secret
                   key: TIME_PERIOD
+            - name: REDIS_USER
+              valueFrom:
+                secretKeyRef:
+                  name: yogram-business-production-config-secret
+                  key: REDIS_USER
+            - name: BUSINESS_SERVICE_URL
+              valueFrom:
+                secretKeyRef:
+                  name: yogram-business-production-config-secret
+                  key: BUSINESS_SERVICE_URL
+            - name: POSTGRES_TYPE
+              valueFrom:
+                secretKeyRef:
+                  name: yogram-business-production-config-secret
+                  key: POSTGRES_TYPE
             - name: POSTGRES_URL
               valueFrom:
                 secretKeyRef:
-                  name: business-production-config-secret
+                  name: yogram-business-production-config-secret
                   key: POSTGRES_URL
+            - name: PROFILE_SETTINGS_PAGE
+              valueFrom:
+                secretKeyRef:
+                  name: yogram-business-production-config-secret
+                  key: PROFILE_SETTINGS_PAGE
+            - name: PAYPAL_CLIENT_ID
+              valueFrom:
+                secretKeyRef:
+                  name: yogram-business-production-config-secret
+                  key: PAYPAL_CLIENT_ID

apps/business/src/api/business.controller.ts

@@ -21,6 +21,7 @@ import {
   Param,
   Patch,
   Post,
+  Res,
   Sse,
 } from '@nestjs/common';
 import {
@@ -38,13 +39,17 @@ import {
 import { NotificationResponseDto } from 'apps/libs/Business/dto/response/response-notification.dto';
 import { ReadNotificationCommand } from '../application/command/read-notification.command';
 import { ReadNotificationDto } from '../../../../apps/libs/Business/dto/input/read-notification.dto';
+import { Response } from 'express';
+import { ConfigService } from '@nestjs/config';
+import { CancelSubscriptionCommand } from '../application/command/cancel-subscription.handler';
 
 @Controller()
 export class BusinessController {
   private eventEmitter: EventEmitter2;
   constructor(
     private readonly commandBus: CommandBus,
     private readonly queryBus: QueryBus,
+    private readonly configService: ConfigService,
   ) {
     this.eventEmitter = new EventEmitter2();
   }
@@ -57,8 +62,16 @@ export class BusinessController {
   @Post('business/paypal-proccess')
   async paypalProcess(
     @Body('subscriptionId') subscriptionId: string,
+    @Res() res: Response,
   ): Promise<void> {
-    await this.commandBus.execute(new SaveSubscriptionCommand(subscriptionId));
+    const subscription = await this.commandBus.execute(
+      new SaveSubscriptionCommand(subscriptionId),
+    );
+    res.status(200).json(subscription);
+    // let page = this.configService.get<string>('PROFILE_SETTINGS_PAGE');
+    // page = page.replace('replace', subscription.userId);
+    // console.log('🚀 ~ BusinessController ~ paypalProcess ~ page:', page);
+    // res.redirect(301, 'https://www.google.com/');
   }
 
   @HttpCode(200)
@@ -113,6 +126,12 @@ export class BusinessController {
     return await this.commandBus.execute(new ActivateSubscriptionCommand(id));
   }
 
+  @Patch('business/subscriptions/:id/cancel')
+  async cancelSubscription(@Param('id') id: string): Promise<void> {
+    console.log('🚀 ~ BusinessController ~ cancelSubscription ~ id:', id);
+    return await this.commandBus.execute(new CancelSubscriptionCommand(id));
+  }
+
   @Get('business/subscriptions/get/:id')
   async getCurrentSubscriptions(
     @Param('id') userId: string,

apps/business/src/application/command/cancel-subscription.handler.ts

@@ -0,0 +1,19 @@
+import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
+import { BusinessCommandService } from '../../business-command.service';
+
+export class CancelSubscriptionCommand {
+  constructor(public readonly id: string) {}
+}
+
+@CommandHandler(CancelSubscriptionCommand)
+export class CancelSubscriptionHandler
+  implements ICommandHandler<CancelSubscriptionCommand>
+{
+  constructor(
+    private readonly businessCommandService: BusinessCommandService,
+  ) {}
+
+  async execute({ id }: CancelSubscriptionCommand): Promise<any> {
+    return await this.businessCommandService.cancelSubscription(id);
+  }
+}

apps/business/src/application/command/save-subscribtion.handler.ts

@@ -32,16 +32,17 @@ export class SaveSubscriptionHandler
     };
 
     const key = getNotificationKey(subscription, notification);
-    await this.notificationGateway.saveNotification(
-      key,
-      notification,
-      2629746000,
-    );
-    await this.notificationGateway.send(
-      notification,
-      WebsocketEvents.SubscriptionActive,
-      30000,
-    );
+    // todo uncomment notif
+    // await this.notificationGateway.saveNotification(
+    //   key,
+    //   notification,
+    //   2629746000,
+    // );
+    // await this.notificationGateway.send(
+    //   notification,
+    //   WebsocketEvents.SubscriptionActive,
+    //   30000,
+    // );
     return subscription;
   }
 }