chaynHQ#430

Removed joins from user.service.ts getUserProfile with subscriptionUser and removed the getUserDto fields, the corresponding methods in serialize.ts,  as well as the ISubscription interface

src/partner/dtos/update-partner.dto.ts

@@ -5,4 +5,4 @@ export class UpdatePartnerDto {
   @IsBoolean()
   @ApiProperty({ type: Boolean })
   active: boolean;
-}
+}

src/partner/partner.controller.ts

@@ -49,10 +49,7 @@ export class PartnerController {
   @Patch(':id')
   @ApiOperation({ description: 'Update a partner profile and makes partner active or inactive' })
   @ApiBody({ type: UpdatePartnerDto })
-  async updatePartner(
-    @Param() { id },
-    @Body() updatePartnerDto: UpdatePartnerDto,
-  ) {
+  async updatePartner(@Param() { id }, @Body() updatePartnerDto: UpdatePartnerDto) {
     return this.partnerService.updatePartner(id, updatePartnerDto);
   }
 }

src/partner/partner.service.spec.ts

@@ -22,9 +22,7 @@ describe('PartnerService', () => {
   let mockUserRepository: DeepMocked<Repository<UserEntity>>;
 
   beforeEach(async () => {
-    mockPartnerRepository = createMock<Repository<PartnerEntity>>(
-      mockPartnerRepositoryMethods,
-    );
+    mockPartnerRepository = createMock<Repository<PartnerEntity>>(mockPartnerRepositoryMethods);
     mockPartnerAccessRepository = createMock<Repository<PartnerAccessEntity>>();
     mockPartnerAdminRepository = createMock<Repository<PartnerAdminEntity>>();
     mockUserRepository = createMock<Repository<UserEntity>>();
@@ -50,39 +48,35 @@ describe('PartnerService', () => {
     it('when supplied with correct data should return new partner', async () => {
       const response = await service.createPartner(createPartnerDto);
       expect(response).toMatchObject(createPartnerDto);
-    })
+    });
     it('when supplied with a name that already exists, it should throw error', async () => {
-      jest
-        .spyOn(mockPartnerRepository, 'create')
-        .mockImplementationOnce(() => {
-          throw ({ code: '23505' });
-        });
+      jest.spyOn(mockPartnerRepository, 'create').mockImplementationOnce(() => {
+        throw { code: '23505' };
+      });
       await expect(service.createPartner(createPartnerDto)).rejects.toThrow();
-    })
+    });
   });
 
   describe('updatePartner', () => {
     it('when supplied with correct data should return new partner', async () => {
       jest.spyOn(mockPartnerRepository, 'createQueryBuilder').mockImplementationOnce(
         createQueryBuilderMock({
-          execute: jest
-            .fn()
-            .mockResolvedValue({raw: [{ ...mockPartnerEntity, active: false }]})
+          execute: jest.fn().mockResolvedValue({ raw: [{ ...mockPartnerEntity, active: false }] }),
         }) as never, // TODO resolve this typescript issue
       );
 
       const response = await service.updatePartner(mockPartnerEntity.id, { active: false });
       expect(response).toMatchObject({ ...mockPartnerEntity, active: false });
-    })
+    });
 
     it('when supplied with incorrect partnerName should throw', async () => {
       jest.spyOn(mockPartnerRepository, 'createQueryBuilder').mockImplementationOnce(() => {
         throw new Error('Error unable to update');
-      })
+      });
 
-      await expect(
-        service.updatePartner(mockPartnerEntity.id, { active: false })
-      ).rejects.toThrow('Error unable to update');
-    })
-  })
-});
+      await expect(service.updatePartner(mockPartnerEntity.id, { active: false })).rejects.toThrow(
+        'Error unable to update',
+      );
+    });
+  });
+});

src/partner/partner.service.ts

@@ -92,7 +92,7 @@ export class PartnerService {
     return 'Successful';
   }
 
-  async updatePartner(partnerId: string, { active }: UpdatePartnerDto){
+  async updatePartner(partnerId: string, { active }: UpdatePartnerDto) {
     const updatedPartnerResponse = await this.partnerRepository
       .createQueryBuilder()
       .update(PartnerEntity)

src/session-user/session-user.controller.ts

@@ -1,7 +1,7 @@
 import { Body, Controller, Post, Req, UseGuards } from '@nestjs/common';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { Request } from 'express';
-import {UserEntity} from '../entities/user.entity';
+import { UserEntity } from '../entities/user.entity';
 import { ControllerDecorator } from 'src/utils/controller.decorator';
 import { FirebaseAuthGuard } from '../firebase/firebase-auth.guard';
 import { UpdateSessionUserDto } from './dtos/update-session-user.dto';

src/session-user/session-user.service.ts

@@ -131,7 +131,7 @@ export class SessionUserService {
   }
 
   public async setSessionUserCompleted(
-    user : UserEntity,
+    user: UserEntity,
     { storyblokId }: UpdateSessionUserDto,
     completed: boolean,
   ) {

src/user/dtos/get-user.dto.ts

@@ -2,7 +2,6 @@ import { ICoursesWithSessions } from 'src/course/course.interface';
 import { ITherapySession } from 'src/webhooks/therapy-session.interface';
 import { IPartnerAccessWithPartner } from '../../partner-access/partner-access.interface';
 import { IPartnerAdminWithPartner } from '../../partner-admin/partner-admin.interface';
-import { ISubscriptionUser } from '../../subscription-user/subscription-user.interface';
 import { IUser } from '../user.interface';
 
 export class GetUserDto {
@@ -11,5 +10,4 @@ export class GetUserDto {
   partnerAdmin?: IPartnerAdminWithPartner;
   courses?: ICoursesWithSessions[];
   therapySessions?: ITherapySession[];
-  subscriptions?: ISubscriptionUser[];
 }

src/user/user.service.ts

@@ -139,8 +139,6 @@ export class UserService {
       .leftJoinAndSelect('courseUser.course', 'course')
       .leftJoinAndSelect('courseUser.sessionUser', 'sessionUser')
       .leftJoinAndSelect('sessionUser.session', 'session')
-      .leftJoinAndSelect('user.subscriptionUser', 'subscriptionUser')
-      .leftJoinAndSelect('subscriptionUser.subscription', 'subscription')
       .where('user.id = :id', { id })
       .getOne();
 

src/utils/serialize.ts

@@ -113,10 +113,6 @@ export const formatUserObject = (userObject: UserEntity): GetUserDto => {
       ? formatPartnerAdminObjects(userObject.partnerAdmin)
       : null,
     courses: userObject.courseUser ? formatCourseUserObjects(userObject.courseUser) : [],
-    subscriptions:
-      userObject.subscriptionUser && userObject.subscriptionUser.length > 0
-        ? formatSubscriptionObjects(userObject.subscriptionUser)
-        : [],
   };
 };
 
@@ -188,12 +184,6 @@ export const serializeZapierSimplyBookDtoToTherapySessionEntity = (
   };
 };
 
-export const formatSubscriptionObjects = (
-  userSubscriptions: SubscriptionUserEntity[],
-): ISubscriptionUser[] => {
-  return userSubscriptions.map((userSubscription) => formatSubscriptionObject(userSubscription));
-};
-
 export const formatSubscriptionObject = (
   userSubscription: SubscriptionUserEntity,
 ): ISubscriptionUser => {