diff --git a/back/src/forms/mail/__tests__/renderFormRefusedEmail.integration.ts b/back/src/forms/mail/__tests__/renderFormRefusedEmail.integration.ts index 0b70e1fdca..68e2ea47a4 100644 --- a/back/src/forms/mail/__tests__/renderFormRefusedEmail.integration.ts +++ b/back/src/forms/mail/__tests__/renderFormRefusedEmail.integration.ts @@ -345,8 +345,8 @@ describe("renderFormRefusedEmail", () => { { email: emitter.user.email, name: emitter.user.name } ]); expect(email!.cc).toEqual([ - { email: destination.user.email, name: destination.user.name }, - { email: ttr.user.email, name: ttr.user.name } + { email: ttr.user.email, name: ttr.user.name }, + { email: destination.user.email, name: destination.user.name } ]); expect(email!.body).toContain(`

Nous vous informons que la société ${destination.company.name} diff --git a/back/src/forms/mail/renderFormRefusedEmail.ts b/back/src/forms/mail/renderFormRefusedEmail.ts index 3e5001335c..30327f6f52 100644 --- a/back/src/forms/mail/renderFormRefusedEmail.ts +++ b/back/src/forms/mail/renderFormRefusedEmail.ts @@ -65,9 +65,10 @@ export async function renderFormRefusedEmail( const destinationCC = await getMailNotificationSubscribers( UserNotification.BSD_REFUSAL, - [form.recipientCompanySiret, forwardedIn?.recipientCompanySiret].filter( - Boolean - ) + [ + form.recipientCompanySiret, + isFinalDestinationRefusal ? forwardedIn?.recipientCompanySiret : null + ].filter(Boolean) ); // include drealsRecipients if settings says so diff --git a/back/src/users/__tests__/database.integration.ts b/back/src/users/__tests__/database.integration.ts index 42e0fe5cbc..136c0b8511 100644 --- a/back/src/users/__tests__/database.integration.ts +++ b/back/src/users/__tests__/database.integration.ts @@ -8,7 +8,7 @@ import { } from "../../__tests__/factories"; import { associateUserToCompany, createUserAccountHash } from "../database"; import { getUserRoles } from "../../permissions"; -import { UserNotification, UserRole } from "@prisma/client"; +import { UserRole } from "@prisma/client"; import { ALL_NOTIFICATIONS } from "../notifications"; describe("createUserAccountHash", () => { diff --git a/back/src/users/database.ts b/back/src/users/database.ts index 81ef2bc70a..6cc286f2d6 100644 --- a/back/src/users/database.ts +++ b/back/src/users/database.ts @@ -9,8 +9,7 @@ import { UserRole, Prisma, Company, - UserAccountHash, - UserNotification + UserAccountHash } from "@prisma/client"; import { hash } from "bcrypt"; import { getUid, sanitizeEmail, hashToken } from "../utils"; diff --git a/back/src/users/resolvers/mutations/__tests__/inviteUserToCompany.integration.ts b/back/src/users/resolvers/mutations/__tests__/inviteUserToCompany.integration.ts index 44d5ac1194..67ef5029ad 100644 --- a/back/src/users/resolvers/mutations/__tests__/inviteUserToCompany.integration.ts +++ b/back/src/users/resolvers/mutations/__tests__/inviteUserToCompany.integration.ts @@ -10,7 +10,7 @@ import { prisma } from "@td/prisma"; import { AuthType } from "../../../../auth"; import { Mutation } from "../../../../generated/graphql/types"; import { ErrorCode, NotCompanyAdminErrorMsg } from "../../../../common/errors"; -import { UserNotification, UserRole } from "@prisma/client"; +import { UserRole } from "@prisma/client"; import { templateIds } from "@td/mail"; import { ALL_NOTIFICATIONS } from "../../../notifications"; diff --git a/back/src/users/resolvers/mutations/changeUserRole.ts b/back/src/users/resolvers/mutations/changeUserRole.ts index 0ad52ffb62..5078642a81 100644 --- a/back/src/users/resolvers/mutations/changeUserRole.ts +++ b/back/src/users/resolvers/mutations/changeUserRole.ts @@ -25,7 +25,6 @@ import { updateCompanyAssociation, updateUserAccountHash } from "../../database"; -import { UserRole } from "@prisma/client"; import { ALL_NOTIFICATIONS } from "../../notifications"; const changeUserRoleResolver: MutationResolvers["changeUserRole"] = async (