fix: service user included partner data (#468)

Author: annarhughes

src/partner-access/partner-access.service.spec.ts

@@ -60,6 +60,8 @@ describe('PartnerAccessService', () => {
   let mockPartnerAccessRepository: DeepMocked<Repository<PartnerAccessEntity>>;
 
   beforeEach(async () => {
+    jest.clearAllMocks();
+
     mockPartnerRepository = createMock<Repository<PartnerEntity>>(mockPartnerRepositoryMethods);
     mockPartnerAccessRepository = createMock<Repository<PartnerAccessEntity>>(
       mockPartnerAccessRepositoryMethods,
@@ -136,7 +138,7 @@ describe('PartnerAccessService', () => {
         return {
           ...mockPartnerAccessEntity,
           id: 'pa1',
-          userId: mockGetUserDto.user.id,
+          userId: mockUserEntity.id,
         };
       });
       // Mocks that the accesscode already exists
@@ -146,13 +148,12 @@ describe('PartnerAccessService', () => {
 
       expect(partnerAccess).toEqual({
         ...mockPartnerAccessEntity,
-        id: 'pa1',
         userId: mockUserEntity.id,
         activatedAt: partnerAccess.activatedAt,
       });
 
       expect(profileData.updateServiceUserProfilesPartnerAccess).toHaveBeenCalledWith(
-        [partnerAccess],
+        [mockPartnerAccessEntity],
         mockUserEntity.email,
       );
     });

src/partner-access/partner-access.service.ts

@@ -187,9 +187,12 @@ export class PartnerAccessService {
     assignedPartnerAccess.partner = partnerAccess.partner;
 
     try {
-      const partnerAccesses = await this.partnerAccessRepository.findBy({
-        userId: user.id,
-        active: true,
+      const partnerAccesses = await this.partnerAccessRepository.find({
+        where: {
+          userId: user.id,
+          active: true,
+        },
+        relations: { partner: true },
       });
       updateServiceUserProfilesPartnerAccess(partnerAccesses, user.email);
     } catch (error) {

src/utils/constants.ts

@@ -53,17 +53,25 @@ export enum COMMUNICATION_SERVICE {
   MAILCHIMP = 'MAILCHIMP',
 }
 
+export enum ENVIRONMENTS {
+  DEVELOPMENT = 'development',
+  STAGING = 'staging',
+  PRODUCTION = 'production',
+  TESTING = 'testing',
+}
+
 const getEnv = (env: string, envName: string): string => {
   try {
-    if (!env) throw `Unable to get environemt variable ${envName}`;
+    if (!env) throw `Unable to get environment variable ${envName}`;
 
     return env;
   } catch (error) {
-    console.log(error);
+    if (nodeEnv !== ENVIRONMENTS.TESTING) console.log(error);
   }
 };
 
-export const isProduction = getEnv(process.env.NODE_ENV, 'NODE_ENV') === 'production';
+export const nodeEnv = getEnv(process.env.NODE_ENV, 'NODE_ENV');
+export const isProduction = nodeEnv === ENVIRONMENTS.PRODUCTION;
 
 export const rollbarEnv = getEnv(process.env.ROLLBAR_ENV, 'ROLLBAR_ENV');
 export const rollbarToken = getEnv(process.env.ROLLBAR_TOKEN, 'ROLLBAR_TOKEN');

src/utils/serviceUserProfiles.ts

@@ -208,6 +208,11 @@ export const serializePartnersString = (partnerAccesses: PartnerAccessEntity[])
   return partnerAccesses?.map((pa) => pa.partner.name.toLowerCase()).join('; ') || '';
 };
 
+const serializeCrispPartnerSegments = (partners: PartnerEntity[]) => {
+  if (!partners.length) return ['public'];
+  return partners.map((p) => p.name.toLowerCase());
+};
+
 const serializeUserData = (user: UserEntity) => {
   const { name, signUpLanguage, contactPermission, serviceEmailsPermission } = user;
 
@@ -356,8 +361,3 @@ const serializeCourseData = (courseUser: CourseUserEntity) => {
 
   return { crispSchema, mailchimpSchema };
 };
-
-const serializeCrispPartnerSegments = (partners: PartnerEntity[]) => {
-  if (!partners.length) return ['public'];
-  return partners.map((p) => p.name.toLowerCase());
-};

test/utils/mockedServices.ts

@@ -35,7 +35,6 @@ import {
   mockTherapySessionEntity,
   mockUserEntity,
   mockUserRecord,
-  partnerAccessArray,
 } from './mockData';
 import { createQueryBuilderMock } from './mockUtils';
 
@@ -209,11 +208,8 @@ export const mockPartnerAccessRepositoryMethods: PartialFuncReturn<
   findBy: async (arg) => {
     return [{ ...mockPartnerAccessEntity, ...(arg ? { ...arg } : {}) }] as PartnerAccessEntity[];
   },
-  find: async (arg) => {
-    return [
-      ...partnerAccessArray,
-      { ...mockPartnerAccessEntity, ...(arg ? { ...arg } : {}) },
-    ] as PartnerAccessEntity[];
+  find: async () => {
+    return [{ ...mockPartnerAccessEntity }] as PartnerAccessEntity[];
   },
   save: async (arg) => arg as PartnerAccessEntity,
 };