Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/subscription-user/subscription-user.controller.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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,
);
}
Expand All @@ -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,
);
Expand Down
4 changes: 2 additions & 2 deletions src/subscription-user/subscription-user.service.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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');
Expand Down
Loading