feat: refactor service user profiles module + create missing mailchim…

…p profile (#528)

src/api/mailchimp/mailchimp-api.ts

@@ -1,8 +1,6 @@
 import mailchimp from '@mailchimp/mailchimp_marketing';
 import { createHash } from 'crypto';
-import { UserEntity } from 'src/entities/user.entity';
 import { mailchimpApiKey, mailchimpAudienceId, mailchimpServerPrefix } from 'src/utils/constants';
-import { createCompleteMailchimpUserProfile } from 'src/utils/serviceUserProfiles';
 import {
   ListMember,
   ListMemberPartial,
@@ -34,17 +32,18 @@ export const createMailchimpProfile = async (
   }
 };
 
-export const batchCreateMailchimpProfiles = async (users: UserEntity[]) => {
+export const batchCreateMailchimpProfiles = async (
+  userProfiles: Partial<UpdateListMemberRequest>[],
+) => {
   try {
     const operations = [];
 
-    users.forEach((user) => {
-      const profileData = createCompleteMailchimpUserProfile(user);
+    userProfiles.forEach((userProfile, index) => {
       operations.push({
         method: 'POST',
         path: `/lists/${mailchimpAudienceId}/members`,
-        operation_id: user.id,
-        body: JSON.stringify(profileData),
+        operation_id: index,
+        body: JSON.stringify(userProfile),
       });
     });
 

src/event-logger/event-logger.module.ts

@@ -10,6 +10,7 @@ import { SubscriptionEntity } from 'src/entities/subscription.entity';
 import { TherapySessionEntity } from 'src/entities/therapy-session.entity';
 import { UserEntity } from 'src/entities/user.entity';
 import { PartnerAccessService } from 'src/partner-access/partner-access.service';
+import { ServiceUserProfilesService } from 'src/service-user-profiles/service-user-profiles.service';
 import { SubscriptionUserService } from 'src/subscription-user/subscription-user.service';
 import { SubscriptionService } from 'src/subscription/subscription.service';
 import { TherapySessionService } from 'src/therapy-session/therapy-session.service';
@@ -33,6 +34,7 @@ import { EventLoggerService } from './event-logger.service';
   providers: [
     EventLoggerService,
     UserService,
+    ServiceUserProfilesService,
     SubscriptionUserService,
     TherapySessionService,
     PartnerAccessService,

src/firebase/firebase.module.ts

@@ -12,6 +12,7 @@ import { SubscriptionEntity } from 'src/entities/subscription.entity';
 import { TherapySessionEntity } from 'src/entities/therapy-session.entity';
 import { UserEntity } from 'src/entities/user.entity';
 import { PartnerService } from 'src/partner/partner.service';
+import { ServiceUserProfilesService } from 'src/service-user-profiles/service-user-profiles.service';
 import { SubscriptionUserService } from 'src/subscription-user/subscription-user.service';
 import { SubscriptionService } from 'src/subscription/subscription.service';
 import { TherapySessionService } from 'src/therapy-session/therapy-session.service';
@@ -38,6 +39,7 @@ import { FIREBASE, firebaseFactory } from './firebase-factory';
     PartnerAccessService,
     CourseUserService,
     PartnerService,
+    ServiceUserProfilesService,
     SubscriptionUserService,
     SubscriptionService,
     TherapySessionService,

src/partner-access/partner-access.module.ts

@@ -12,6 +12,7 @@ import { SubscriptionEntity } from 'src/entities/subscription.entity';
 import { TherapySessionEntity } from 'src/entities/therapy-session.entity';
 import { UserEntity } from 'src/entities/user.entity';
 import { PartnerService } from 'src/partner/partner.service';
+import { ServiceUserProfilesService } from 'src/service-user-profiles/service-user-profiles.service';
 import { SubscriptionUserService } from 'src/subscription-user/subscription-user.service';
 import { SubscriptionService } from 'src/subscription/subscription.service';
 import { TherapySessionService } from 'src/therapy-session/therapy-session.service';
@@ -42,6 +43,7 @@ import { PartnerAccessService } from './partner-access.service';
     UserService,
     CourseUserService,
     PartnerService,
+    ServiceUserProfilesService,
     SubscriptionUserService,
     SubscriptionService,
     TherapySessionService,

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

@@ -5,8 +5,8 @@ import { sub } from 'date-fns';
 import * as crispApi from 'src/api/crisp/crisp-api';
 import * as mailchimpApi from 'src/api/mailchimp/mailchimp-api';
 import { PartnerEntity } from 'src/entities/partner.entity';
+import { ServiceUserProfilesService } from 'src/service-user-profiles/service-user-profiles.service';
 import { GetUserDto } from 'src/user/dtos/get-user.dto';
-import * as profileData from 'src/utils/serviceUserProfiles';
 import {
   mockPartnerAccessEntity,
   mockPartnerAccessEntityBase,
@@ -60,6 +60,7 @@ describe('PartnerAccessService', () => {
   let repo: Repository<PartnerAccessEntity>;
   let mockPartnerRepository: DeepMocked<Repository<PartnerEntity>>;
   let mockPartnerAccessRepository: DeepMocked<Repository<PartnerAccessEntity>>;
+  let mockServiceUserProfilesService: DeepMocked<ServiceUserProfilesService>;
 
   beforeEach(async () => {
     jest.clearAllMocks();
@@ -68,6 +69,7 @@ describe('PartnerAccessService', () => {
     mockPartnerAccessRepository = createMock<Repository<PartnerAccessEntity>>(
       mockPartnerAccessRepositoryMethods,
     );
+    mockServiceUserProfilesService = createMock<ServiceUserProfilesService>();
 
     const module: TestingModule = await Test.createTestingModule({
       providers: [
@@ -80,6 +82,7 @@ describe('PartnerAccessService', () => {
           provide: getRepositoryToken(PartnerEntity),
           useValue: mockPartnerRepository,
         },
+        { provide: ServiceUserProfilesService, useValue: mockServiceUserProfilesService },
       ],
     }).compile();
 
@@ -145,8 +148,6 @@ describe('PartnerAccessService', () => {
       });
       // Mocks that the accesscode already exists
       jest.spyOn(repo, 'findOne').mockResolvedValueOnce(mockPartnerAccessEntity);
-      // Observer on the service user profiles method
-      jest.spyOn(profileData, 'updateServiceUserProfilesPartnerAccess');
 
       const partnerAccess = await service.assignPartnerAccess(mockUserEntity, '123456');
 
@@ -156,10 +157,9 @@ describe('PartnerAccessService', () => {
         activatedAt: partnerAccess.activatedAt,
       });
 
-      expect(profileData.updateServiceUserProfilesPartnerAccess).toHaveBeenCalledWith(
-        [mockPartnerAccessEntity],
-        mockUserEntity.email,
-      );
+      expect(
+        mockServiceUserProfilesService.updateServiceUserProfilesPartnerAccess,
+      ).toHaveBeenCalledWith([mockPartnerAccessEntity], mockUserEntity.email);
     });
 
     it('should assign partner access even if crisp profile api fails', async () => {

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

@@ -5,7 +5,7 @@ import _ from 'lodash';
 import { PartnerEntity } from 'src/entities/partner.entity';
 import { UserEntity } from 'src/entities/user.entity';
 import { Logger } from 'src/logger/logger';
-import { updateServiceUserProfilesPartnerAccess } from 'src/utils/serviceUserProfiles';
+import { ServiceUserProfilesService } from 'src/service-user-profiles/service-user-profiles.service';
 import { Repository } from 'typeorm';
 import { PartnerAccessEntity } from '../entities/partner-access.entity';
 import { FEATURES, PartnerAccessCodeStatusEnum } from '../utils/constants';
@@ -29,6 +29,7 @@ export class PartnerAccessService {
     private partnerAccessRepository: Repository<PartnerAccessEntity>,
     @InjectRepository(PartnerEntity)
     private partnerRepository: Repository<PartnerEntity>,
+    private readonly serviceUserProfilesService: ServiceUserProfilesService,
   ) {}
 
   async createPartnerAccess(
@@ -194,7 +195,10 @@ export class PartnerAccessService {
         },
         relations: { partner: true },
       });
-      updateServiceUserProfilesPartnerAccess(partnerAccesses, user.email);
+      this.serviceUserProfilesService.updateServiceUserProfilesPartnerAccess(
+        partnerAccesses,
+        user.email,
+      );
     } catch (error) {
       this.logger.error(
         `Error: Unable to update crisp profile for ${user.email}. Error: ${error.message} `,

src/service-user-profiles/service-user-profiles.module.ts

@@ -0,0 +1,11 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { UserEntity } from 'src/entities/user.entity';
+import { UserService } from 'src/user/user.service';
+import { ServiceUserProfilesService } from './service-user-profiles.service';
+
+@Module({
+  imports: [TypeOrmModule.forFeature([UserEntity])],
+  providers: [ServiceUserProfilesService, UserService],
+})
+export class ServiceUserProfilesModule {}