@silexpert/core 1.2.87 → 1.2.89

package/ts/types/Interface/api/mail/QueryGetSignature.ts

@@ -12,6 +12,11 @@ export class QueryGetSignature {
   @IsInt()
   idTypeBrand?: number;
 
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  fromAddress?: string;
+
   @ApiPropertyOptional()
   @IsOptional()
   @IsString()

package/ts/types/Interface/api/pdf/ReadPdfizer.ts

@@ -5,7 +5,7 @@ export interface ReadPdfizer {
   Bucket: string;
 }
 
-export type PdfContent = { body: string; header?: string; footer?: string };
+export type PdfContent = { body: string; header?: string; footer?: string; filePath?: string };
 export type PdfOptions = {
   margins?: { left?: string; top?: string; right?: string; bottom?: string };
   folder?: string;

package/ts/types/Interface/api/society/QueryPaginatedSociety.ts

@@ -3,6 +3,11 @@ import { ApiPropertyOptional } from '../../../../utils';
 import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
 
 export class QueryPaginatedSociety {
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+  id?: number;
+
   @ApiPropertyOptional()
   @IsOptional()
   @IsString()

package/ts/types/Interface/models/ICollaboraterDetail.ts

@@ -1,3 +1,4 @@
+import { EnglishLevel } from '../../Enum/EnglishLevel';
 import { IUser } from './IUser';
 
 export interface ICollaboraterDetail {
@@ -22,6 +23,7 @@ export interface ICollaboraterDetail {
   emergencyPersonPhone: string;
   hasTicketRestaurant: boolean;
   hasRqth: boolean;
+  englishLevel?: EnglishLevel | null;
   createdAt?: Date | null;
   updatedAt?: Date | null;
 

package/ts/types/Interface/models/IUser.ts

@@ -97,6 +97,7 @@ export interface IUser {
   streetNumber?: string | null;
   address?: string;
   zipCodeBirth?: string;
+  //@deprecated Use cityOfBirth instead
   birthPlace?: string;
   departmentBirth?: string;
   idCountryBirth?: number;

package/ts/types/index.ts

@@ -572,6 +572,7 @@ export * from './Enum/ReasonNotSubscribed';
 export * from './Enum/QualificationLead';
 export * from './Enum/Template';
 export * from './Enum/Marketing';
+export * from './Enum/EnglishLevel';
 
 // Interfaces API
 export * from './Interface/api/exercice/ReadExercice';
@@ -894,6 +895,7 @@ export * from './Interface/api/humanResourceLibrary/QueryHumanResourceLibrary';
 export * from './Interface/api/humanResourceLibrary/CreateHumanResourceLibrary';
 export * from './Interface/api/humanResourceLibrary/CreateUserHumanResourceLibrary';
 export * from './Interface/api/report/ExternalReport';
+export * from './Interface/api/collaboraterDetail/CreateCollaboraterDetail';
 
 export * from './Interface/api/library/QueryLibrary';
 export * from './Interface/api/library/ReadLibraryFile';

package/ts/utils/email.ts

@@ -15,7 +15,6 @@ function getRoleSignature(user: any) {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   if (user.positionLabel) return user.positionLabel;
 
-
   const isStagiaireOrAlternant =
     // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     user.roles.map((r: any) => r.id).includes(Role.INTERN) || user.roles.map((r: any) => r.id).includes(Role.ALTERNATE);
@@ -213,7 +212,6 @@ function getMailSignature(user: any, idTypeBrand: number) {
 }
 
 function getPhoneSignature(user: any) {
-
   if (user.phone !== '0383931414') {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return user.phone.replace(/\B(?=(\d{2})+(?!\d))/g, ' ');
@@ -222,8 +220,8 @@ function getPhoneSignature(user: any) {
 }
 
 export function generateSignature(params: any): string {
-  const { forceRole = null, idTypeBrand = 1, society, ...otherParams } = params;
-  let { user } = otherParams;
+  const { fromAddress = null, idTypeBrand = 1, society, ...otherParams } = params;
+  let { user, forceRole = null } = otherParams;
 
   const hostS3 = getBrandConfig({
     idTypeBrand,
@@ -303,6 +301,20 @@ export function generateSignature(params: any): string {
     objectWaited: 'listPhones.social',
   }) as unknown as string;
 
+  // Pour les cas hybrides des personnes ayant plusieurs rôles
+  // Comme Morgane (Facturation + Satisfaction) et qui peut choisir plusieurs emails d'expédition
+  // Il faut que la signature corresponde à l'adresse d'expédition
+  // donc actuellement, on ne gère que satisfaction/resiliation/facturation
+  const listGenericEmails: { email: string; forceRole: string }[] = [
+    { email: satisfactionMail, forceRole: 'satisfaction' },
+    { email: resiliationMail, forceRole: 'resiliation' },
+    { email: facturationMail, forceRole: 'facturation' },
+  ];
+  const genericEmailUsed = listGenericEmails.find((e) => e.email === fromAddress);
+  if(genericEmailUsed){
+    forceRole = genericEmailUsed.forceRole;
+  }
+
   let roleSignature: string | null;
   let mailSignature: string | null;
   let phoneSignature: string | null;