Merge pull request #1 from Autoadmin-org/backend_development

added email confirmation letter sending when user added in group is not active

Author: Artuomka

backend/src/entities/group/use-cases/add-user-in-group.use.case.ts

@@ -6,7 +6,7 @@ import { BaseType } from '../../../common/data-injection.tokens';
 import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.intarface';
 import { Messages } from '../../../exceptions/text/messages';
 import { UserEntity } from '../../user/user.entity';
-import { sendInvitationToGroup } from '../../email/send-email';
+import { sendEmailConfirmation, sendInvitationToGroup } from '../../email/send-email';
 import { AddedUserInGroupDs } from '../application/data-sctructures/added-user-in-group.ds';
 import { StripeUtil } from '../../user/utils/stripe-util';
 import { Constants } from '../../../helpers/constants/constants';
@@ -34,7 +34,7 @@ export class AddUserInGroupUseCase
   protected async implementation(inputData: AddUserInGroupDs): Promise<AddedUserInGroupDs> {
     const { email, groupId } = inputData;
     const foundGroup = await this._dbContext.groupRepository.findGroupById(groupId);
-    const foundUser = await this._dbContext.userRepository.findOneUserByEmail(email);
+    const foundUser = await this._dbContext.userRepository.findUserByEmailWithEmailVerificationAndInvitation(email);
 
     if (foundUser && foundUser.isActive) {
       const userAlreadyAdded = !!foundGroup.users.find((u) => u.id === foundUser.id);
@@ -64,6 +64,10 @@ export class AddUserInGroupUseCase
       }
       const savedGroup = await this._dbContext.groupRepository.saveNewOrUpdatedGroup(foundGroup);
       delete savedGroup.connection;
+      const newEmailVerification = await this._dbContext.emailVerificationRepository.createOrUpdateEmailVerification(
+        foundUser,
+      );
+      await sendEmailConfirmation(foundUser.email, newEmailVerification.verification_string);
       await sendInvitationToGroup(foundUser.email, savedInvitation.verification_string);
       if (userAlreadyAdded) {
         throw new HttpException(

backend/src/entities/user/repository/user.repository.interface.ts

@@ -21,6 +21,8 @@ export interface IUserRepository {
 
   findOneUserWithEmailVerification(userId: string): Promise<UserEntity>;
 
+  findUserByEmailWithEmailVerificationAndInvitation(email: string): Promise<UserEntity>
+
   deleteUserEntity(user: UserEntity): Promise<UserEntity>;
 
   getUsersWithNotNullGCLIDsInTwoWeeks(): Promise<Array<UserEntity>>;

backend/src/entities/user/repository/user.repository.ts

@@ -72,6 +72,15 @@ export class UserRepository extends Repository<UserEntity> implements IUserRepos
     return await usersQb.getOne();
   }
 
+  public async findUserByEmailWithEmailVerificationAndInvitation(email: string): Promise<UserEntity> {
+    const usersQb = await getRepository(UserEntity)
+      .createQueryBuilder('user')
+      .leftJoinAndSelect('user.email_verification', 'email_verification')
+      .leftJoinAndSelect('user.user_invitation', 'user_invitation')
+      .where('user.email = :userEmail', { userEmail: email });
+    return await usersQb.getOne();
+  }
+
   public async findAllUsersInConnection(
     connectionId: string,
   ): Promise<Array<Omit<UserEntity, 'connections' | 'groups'>>> {