Feat/ban 114 restore

apps/business/Jenkinsfile

@@ -3,13 +3,13 @@ pipeline {
     agent any
     environment {
         ENV_TYPE = "production"
-        PORT = 3986
+        PORT = 4161
         NAMESPACE = "yogram-ru"
         REGISTRY_HOSTNAME = "idogmat"
-        PROJECT = "business"
+        PROJECT = "business-yogram"
         SERVICE="business"
         REGISTRY = "registry.hub.docker.com"
-        DEPLOYMENT_NAME = "business-deployment"
+        DEPLOYMENT_NAME = "business-yogram-deployment"
         IMAGE_NAME = "${env.BUILD_ID}_${env.ENV_TYPE}_${env.GIT_COMMIT}"
         DOCKER_BUILD_NAME = "${env.REGISTRY_HOSTNAME}/${env.PROJECT}:${env.IMAGE_NAME}"
     }
@@ -20,31 +20,31 @@ pipeline {
                 checkout scm
             }
         }
-        stage('Unit tests') {
-            steps {
-                script {
-                    sh '''
-                       export NVM_DIR="$HOME/.nvm"
-                       [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
-                       nvm use --lts
-                       yarn install
-                       yarn test
-                    '''
-                }
-            }
-        }
-        stage('e2e tests') {
-            steps {
-                script {
-                    sh '''
-                       export NVM_DIR="$HOME/.nvm"
-                       [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
-                       nvm use --lts
-                       yarn test:e2e
-                    '''
-                }
-            }
-        }
+        // stage('Unit tests') {
+        //     steps {
+        //         script {
+        //             sh '''
+        //                export NVM_DIR="$HOME/.nvm"
+        //                [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
+        //                nvm use --lts
+        //                yarn install
+        //                yarn test
+        //             '''
+        //         }
+        //     }
+        // }
+        // stage('e2e tests') {
+        //     steps {
+        //         script {
+        //             sh '''
+        //                export NVM_DIR="$HOME/.nvm"
+        //                [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
+        //                nvm use --lts
+        //                yarn test:e2e
+        //             '''
+        //         }
+        //     }
+        // }
         stage('Build docker image') {
             steps {
                 echo "Build image started..."

apps/business/deployment.yaml

@@ -20,65 +20,64 @@ spec:
           image: REGISTRY_HOSTNAME/PROJECT:TAG_VERSION
           ports:
             - 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: business-yogram-production-config-secret
                   key: PAYPAL_SECRET
             - name: USERS_SERVICE_URL
               valueFrom:
                 secretKeyRef:
-                  name: business-production-config-secret
+                  name: business-yogram-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: business-yogram-production-config-secret
                   key: REDIS_PASSWORD
             - name: REDIS_HOST
               valueFrom:
                 secretKeyRef:
-                  name: business-production-config-secret
+                  name: business-yogram-production-config-secret
                   key: REDIS_HOST
             - name: REDIS_PORT
               valueFrom:
                 secretKeyRef:
-                  name: business-production-config-secret
+                  name: business-yogram-production-config-secret
                   key: REDIS_PORT
             - name: TIME_PERIOD
               valueFrom:
                 secretKeyRef:
-                  name: business-production-config-secret
+                  name: business-yogram-production-config-secret
                   key: TIME_PERIOD
+            - name: REDIS_USER
+              valueFrom:
+                secretKeyRef:
+                  name: business-yogram-production-config-secret
+                  key: REDIS_USER
+            - name: BUSINESS_SERVICE_URL
+              valueFrom:
+                secretKeyRef:
+                  name: business-yogram-production-config-secret
+                  key: BUSINESS_SERVICE_URL
+            - name: POSTGRES_TYPE
+              valueFrom:
+                secretKeyRef:
+                  name: business-yogram-production-config-secret
+                  key: POSTGRES_TYPE
             - name: POSTGRES_URL
               valueFrom:
                 secretKeyRef:
-                  name: business-production-config-secret
+                  name: business-yogram-production-config-secret
                   key: POSTGRES_URL
+            - name: PROFILE_SETTINGS_PAGE
+              valueFrom:
+                secretKeyRef:
+                  name: business-yogram-production-config-secret
+                  key: PROFILE_SETTINGS_PAGE
+            - name: PAYPAL_CLIENT_ID
+              valueFrom:
+                secretKeyRef:
+                  name: business-yogram-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,20 @@ 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));
+    console.log(
+      '🚀 ~ BusinessController ~ paypalProcess ~ subscriptionId:',
+      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 +130,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,
@@ -137,6 +160,7 @@ export class BusinessController {
   async getUserNotifications(
     @Param('id') id: string,
   ): Promise<NotificationResponseDto[]> {
+    console.log('🚀 ~ BusinessController ~ getUserNotifications ~ id:', id);
     return await this.queryBus.execute(new GetUserNotificationsQuery(id));
   }
 

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/read-notification.command.ts

@@ -14,6 +14,6 @@ export class ReadNotificationHandler
   ) {}
 
   async execute({ notificationId }: ReadNotificationCommand): Promise<any> {
-    return await this.businessCommandService.updateNotification(notificationId);
+    // return await this.businessCommandService.updateNotification(notificationId);
   }
 }

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

@@ -6,6 +6,7 @@ import { BusinessCommandService } from '../../business-command.service';
 import { WebsocketEvents } from '../../constants/websocket.event.enum';
 import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
 import { v4 } from 'uuid';
+import { NotificationsService } from '../../notifications.service';
 export class SaveSubscriptionCommand {
   constructor(public readonly id: string) {}
 }
@@ -16,7 +17,7 @@ export class SaveSubscriptionHandler
 {
   constructor(
     private readonly businessCommandService: BusinessCommandService,
-    private readonly notificationGateway: NotificationsGateway,
+    private readonly notificationsService: NotificationsService,
   ) {}
 
   async execute({ id }: SaveSubscriptionCommand): Promise<Subscription> {
@@ -29,15 +30,17 @@ export class SaveSubscriptionHandler
       userId: subscription.userId,
       expiresAt: new Date(subscription.expiresAt).getTime(),
       createdAt: new Date(subscription.createdAt).getTime(),
+      delivered: false,
     };
 
     const key = getNotificationKey(subscription, notification);
-    await this.notificationGateway.saveNotification(
+    // todo uncomment notif
+    await this.notificationsService.saveNotification(
       key,
       notification,
       2629746000,
     );
-    await this.notificationGateway.send(
+    await this.notificationsService.send(
       notification,
       WebsocketEvents.SubscriptionActive,
       30000,

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

@@ -6,6 +6,7 @@ import { WebsocketEvents } from '../../constants/websocket.event.enum';
 import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
 import { v4 } from 'uuid';
 import { Subscription } from '../../infrastructure/entity/subscription.entity';
+import { NotificationsService } from '../../notifications.service';
 
 export class SubscriptionUpdatedCommand {
   constructor(public readonly subscriptionId: string) {}
@@ -17,7 +18,7 @@ export class SubscriptionUpdatedHandler
 {
   constructor(
     private readonly businessCommandService: BusinessCommandService,
-    private readonly notificationGateway: NotificationsGateway,
+    private readonly notificationsService: NotificationsService,
   ) {}
   async execute({
     subscriptionId,
@@ -34,14 +35,15 @@ export class SubscriptionUpdatedHandler
       userId: subscription.userId,
       expiresAt: new Date(subscription.expiresAt).getTime(),
       createdAt: new Date(subscription.createdAt).getTime(),
+      delivered: false,
     };
     const key = getNotificationKey(subscription, notification);
-    await this.notificationGateway.saveNotification(
+    await this.notificationsService.saveNotification(
       key,
       notification,
       2629746000,
     );
-    await this.notificationGateway.send(
+    await this.notificationsService.send(
       notification,
       WebsocketEvents.SubscriptionActive,
       30000,

apps/business/src/application/query/get-user-notifications.handler.ts

@@ -1,6 +1,6 @@
 import { INotification } from '../../../../../apps/libs/common/notifications/interfaces/notification.interface';
-import { NotificationsGateway } from '../../../../../apps/libs/common/notifications/notifications.gateway';
 import { IQueryHandler, QueryHandler } from '@nestjs/cqrs';
+import { NotificationsService } from '../../notifications.service';
 
 export class GetUserNotificationsQuery {
   constructor(public readonly userId: string) {}
@@ -10,11 +10,11 @@ export class GetUserNotificationsQuery {
 export class GetUserNotificationsHandler
   implements IQueryHandler<GetUserNotificationsQuery>
 {
-  constructor(private readonly notificationGateway: NotificationsGateway) {}
+  constructor(private readonly notificationsService: NotificationsService) {}
 
   async execute({
     userId,
   }: GetUserNotificationsQuery): Promise<INotification[]> {
-    return await this.notificationGateway.getUserNotifications(userId);
+    return await this.notificationsService.getUserNotifications(userId);
   }
 }