@silexpert/core 1.3.205-1 → 1.3.205-3

package/ts/types/Interface/api/user/CreateCoworker.ts

@@ -11,8 +11,10 @@ import {
   IsPhoneNumber,
   IsString,
 } from 'class-validator';
+import { Transform } from 'class-transformer';
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils/decorators';
 import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
+import { ToNumber } from '../../../../utils/transforms/number.transform';
 import { EntityType } from '../../../Enum/EntityType';
 
 export class CreateCoworker {
@@ -49,6 +51,7 @@ export class CreateCoworker {
   @ApiPropertyOptional()
   @IsOptional()
   @IsNumber()
+  @ToNumber()
   idCivility?: number;
 
   @ApiProperty({ default: true })
@@ -101,17 +104,25 @@ export class CreateCoworker {
   @ApiProperty()
   @IsDefined()
   @IsInt()
+  @ToNumber()
   idOffice: number;
 
   @ApiProperty()
   @IsDefined()
   @IsEnum(EntityType)
+  @ToNumber()
   entity: EntityType;
 
   @ApiPropertyOptional()
   @IsOptional()
   @IsArray()
   @IsInt({ each: true })
+  @Transform(({ value }: { value: any }) => {
+    if (Array.isArray(value)) {
+      return value.map((v) => Number(v));
+    }
+    return value as number;
+  })
   idRoles?: number[];
 
   @ApiPropertyOptional()

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

@@ -80,6 +80,7 @@ export interface IUser {
   idProspectIsWith?: number | null;
   apprentice?: boolean;
   flexitime?: boolean;
+  idOffice?: number | null;
   /**
    * @deprecated
    */

package/ts/utils/societyApproval.ts

@@ -81,8 +81,15 @@ export function getApprovalDocumentInfos(
  * @returns L'objet de données formaté pour le template
  */
 export function buildApprovalTemplateData(existingApproval: ISocietyApproval, style: string): Record<string, any> {
-  const yearInText = convertNumberToLetter(+dayjs().format('YYYY')).toLowerCase();
-  const dayAndMonthInText = `${convertNumberToLetter(+dayjs().format('D'))} ${dayjs().locale('fr').format('MMMM').toLowerCase()}`;
+  const yearInText = convertNumberToLetter(
+    +dayjs(existingApproval?.generatingDatas?.approvalDate || null).format('YYYY'),
+  ).toLowerCase();
+  const dayAndMonthInText = `${convertNumberToLetter(+dayjs(existingApproval?.generatingDatas?.approvalDate || null).format('D'))} ${dayjs(
+    existingApproval?.generatingDatas?.approvalDate || null,
+  )
+    .locale('fr')
+    .format('MMMM')
+    .toLowerCase()}`;
   const brand = getBrand();
   return {
     // Variables globales
@@ -131,7 +138,7 @@ export function buildApprovalTemplateData(existingApproval: ISocietyApproval, st
         ...existingApproval?.exercice?.society,
         cityOfGreffe: getCityOfGreffeName(existingApproval?.exercice?.society?.idCityOfGreffe).toUpperCase(),
         siren: existingApproval?.exercice?.society?.siret
-          ? siretToSiren(existingApproval.exercice.society.siret)
+          ? siretToSiren(existingApproval.exercice.society.siret)?.replace(/(\d{3})(\d{3})(\d{3})/, '$1 $2 $3') ?? null
           : null,
       },
       endDate: dayjs(existingApproval?.exercice?.endDate).locale('fr').format('DD MMMM YYYY').toLowerCase(),

package/ts/utils/transforms/number.transform.ts

@@ -0,0 +1,38 @@
+import { Transform } from 'class-transformer';
+
+const valueToNumber = (value: any) => {
+  if (value === null || value === undefined || value === '') {
+    return undefined;
+  }
+  if (typeof value === 'number') {
+    return value;
+  }
+  if (typeof value === 'string') {
+    const num = Number(value);
+    if (isNaN(num)) {
+      return undefined;
+    }
+    return num;
+  }
+  return undefined;
+};
+
+const ToNumber = () => {
+  const toPlain = Transform(
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    ({ value }) => value,
+    {
+      toPlainOnly: true,
+    },
+  );
+  const toClass = (target: any, key: string) =>
+    Transform(({ obj }) => valueToNumber(obj[key]), {
+      toClassOnly: true,
+    })(target, key);
+  return (target: any, key: string) => {
+    toPlain(target, key);
+    toClass(target, key);
+  };
+};
+
+export { ToNumber };