Ticket-547 updated sub-user service and controller to use user entity (#568)

* Ticket-547 updated sub-user service and controller to use user entity

* Ticket-547 fix naming issue

Author: ckirby19

src/subscription-user/subscription-user.controller.ts

@@ -1,6 +1,7 @@
 import { Body, Controller, Param, Patch, Post, Req, UseGuards } from '@nestjs/common';
 import { ApiBearerAuth, ApiOperation, ApiParam, ApiTags } from '@nestjs/swagger';
 import { Request } from 'express';
+import { UserEntity } from 'src/entities/user.entity';
 import { FirebaseAuthGuard } from '../firebase/firebase-auth.guard';
 import { ControllerDecorator } from '../utils/controller.decorator';
 import { CreateSubscriptionUserDto } from './dto/create-subscription-user.dto';
@@ -26,7 +27,7 @@ export class SubscriptionUserController {
     @Body() createSubscriptionUserDto: CreateSubscriptionUserDto,
   ): Promise<ISubscriptionUser | undefined> {
     return await this.subscriptionUserService.createWhatsappSubscription(
-      req['user'],
+      req['userEntity'] as UserEntity,
       createSubscriptionUserDto,
     );
   }
@@ -44,8 +45,8 @@ export class SubscriptionUserController {
     @Body() updateSubscriptionsDto: UpdateSubscriptionUserDto,
   ): Promise<ISubscriptionUser | undefined> {
     return this.subscriptionUserService.cancelWhatsappSubscription(
-      req['user'].user.id,
-      req['user'].user.email,
+      req['userEntity'].id,
+      req['userEntity'].email,
       updateSubscriptionsDto,
       id,
     );

src/subscription-user/subscription-user.service.ts

@@ -1,11 +1,11 @@
 import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { SubscriptionUserEntity } from 'src/entities/subscription-user.entity';
+import { UserEntity } from 'src/entities/user.entity';
 import { IsNull, Repository } from 'typeorm';
 import { ZapierWebhookClient } from '../api/zapier/zapier-webhook-client';
 import { Logger } from '../logger/logger';
 import { SubscriptionService } from '../subscription/subscription.service';
-import { GetUserDto } from '../user/dtos/get-user.dto';
 import { WhatsappSubscriptionStatusEnum } from '../utils/constants';
 import { formatSubscriptionObject } from '../utils/serialize';
 import { CreateSubscriptionUserDto } from './dto/create-subscription-user.dto';
@@ -24,7 +24,7 @@ export class SubscriptionUserService {
   ) {}
 
   async createWhatsappSubscription(
-    { user }: GetUserDto,
+    user: UserEntity,
     createSubscriptionUserDto: CreateSubscriptionUserDto,
   ): Promise<ISubscriptionUser | undefined> {
     const whatsapp = await this.subscriptionService.getSubscription('whatsapp');