@silexpert/core 0.4.263 → 0.4.265

package/ts/types/Enum/RoleDetail.ts

@@ -4,30 +4,35 @@ export const RoleDetail = {
     name: 'Client',
     colorPrimary: '#8765D0',
     colorSecondary: '#DED7F6',
+    subRole: false,
   },
   ADMIN: {
     id: 2,
     name: 'Admin',
     colorPrimary: '#8765D0',
     colorSecondary: '#DED7F6',
+    subRole: false,
   },
   FRONT_OFFICE: {
     id: 3,
     name: 'Front Office',
     colorPrimary: '#8765D0',
     colorSecondary: '#DED7F6',
+    subRole: false,
   },
   COMMERCIAL: {
     id: 9,
     name: 'Commercial',
     colorPrimary: '#8765D0',
     colorSecondary: '#DED7F6',
+    subRole: false,
   },
   CUSTOMER_SUCCESS: {
     id: 10,
     name: 'Customer success',
     colorPrimary: '#5894EF',
     colorSecondary: '#DAEEFC',
+    subRole: false,
     handledInUserSocietyPermissionTable: false,
   },
   SOCIAL: {
@@ -35,182 +40,233 @@ export const RoleDetail = {
     name: 'Social',
     colorPrimary: '#8765D0',
     colorSecondary: '#DED7F6',
+    subRole: false,
   },
   JURIDIC: {
     id: 12,
     name: 'Juridique',
     colorPrimary: '#8765D0',
     colorSecondary: '#DED7F6',
-  },
-  CHIEF_ACCOUNTANT: {
-    id: 13,
-    name: 'Chef comptable',
-    colorPrimary: '#8765D0',
-    colorSecondary: '#DED7F6',
-  },
-  SUPERVISOR: {
-    id: 14,
-    name: 'Superviseur',
-    colorPrimary: '#8765D0',
-    colorSecondary: '#DED7F6',
-  },
+    subRole: false,
+  },
+  // CHIEF_ACCOUNTANT: {
+  //   id: 13,
+  //   name: 'Chef comptable',
+  //   colorPrimary: '#8765D0',
+  //   colorSecondary: '#DED7F6',
+  // subRole: false,
+  // },
+  // SUPERVISOR: {
+  //   id: 14,
+  //   name: 'Superviseur',
+  //   colorPrimary: '#8765D0',
+  //   colorSecondary: '#DED7F6',
+  // subRole: false,
+  // },
   FRONT_OFFICE_EXPRESS: {
     id: 15,
     name: 'Front office express',
     colorPrimary: '#8765D0',
     colorSecondary: '#DED7F6',
+    subRole: false,
   },
   SUPER_ADMIN: {
     id: 16,
     name: 'Super admin',
     colorPrimary: '#8765D0',
     colorSecondary: '#DED7F6',
+    subRole: false,
   },
   EXPERT_SUB_CONTRACTOR: {
     id: 17,
     name: 'Expert sous-traitant',
     colorPrimary: '#B5D33C',
     colorSecondary: '#EEF4C3',
+    subRole: false,
   },
   MAINTAINER: {
     id: 18,
     name: 'Admin partenaire',
     colorPrimary: '#8765D0',
     colorSecondary: '#DED7F6',
+    subRole: false,
   },
   MANAGER: {
     id: 19,
     name: 'Manager',
     colorPrimary: '#8765D0',
     colorSecondary: '#DED7F6',
+    subRole: false,
   },
   EXPERT_ACCOUNTANT: {
     id: 20,
     name: 'Expert-comptable',
     colorPrimary: '#B5D33C',
     colorSecondary: '#EEF4C3',
+    subRole: false,
     handledInUserSocietyPermissionTable: false,
   },
-  MFA_PENDING: {
-    id: 21,
-    name: 'Attente MFA',
-    colorPrimary: '#8765D0',
-    colorSecondary: '#DED7F6',
-  },
-  VAT: {
-    id: 22,
-    name: 'VAT',
-    colorPrimary: '#8765D0',
-    colorSecondary: '#DED7F6',
-  },
+  // MFA_PENDING: {
+  //   id: 21,
+  //   name: 'Attente MFA',
+  //   colorPrimary: '#8765D0',
+  //   colorSecondary: '#DED7F6',
+  //   subRole: false,
+  // },
+  // VAT: {
+  //   id: 22,
+  //   name: 'VAT',
+  //   colorPrimary: '#8765D0',
+  //   colorSecondary: '#DED7F6',
+  //   subRole: false,
+  // },
   CANDIDAT: {
     id: 24,
     name: 'Candidat',
     colorPrimary: '#8765D0',
     colorSecondary: '#DED7F6',
+    subRole: false,
   },
   DEVELOPER: {
     id: 25,
     name: 'Développeur',
     colorPrimary: '#8765D0',
     colorSecondary: '#DED7F6',
+    subRole: false,
   },
   API: {
     id: 26,
     name: 'API',
     colorPrimary: '#8765D0',
     colorSecondary: '#DED7F6',
-  },
-  BACK_OFFICE: {
-    id: 27,
-    name: 'Back office',
-    colorPrimary: '#8765D0',
-    colorSecondary: '#DED7F6',
-  },
-  BACK_OFFICE_EXPRESS: {
-    id: 28,
-    name: 'Back office express',
-    colorPrimary: '#8765D0',
-    colorSecondary: '#DED7F6',
-  },
-  BACK_MANAGER: {
-    id: 30,
-    name: 'Manager back',
-    colorPrimary: '#8765D0',
-    colorSecondary: '#DED7F6',
-    handledInUserSocietyPermissionTable: false,
-  },
-  FRONT_MANAGER: {
-    id: 31,
-    name: 'Manager front',
-    colorPrimary: '#8765D0',
-    colorSecondary: '#DED7F6',
-  },
-  CUSTOMER_SUCCESS_MANAGER: {
-    id: 32,
-    name: 'Customer success manager',
-    colorPrimary: '#5894EF',
-    colorSecondary: '#DAEEFC',
-    handledInUserSocietyPermissionTable: false,
-  },
-  COMMERCIAL_MANAGER: {
-    id: 33,
-    name: 'Manager commercial',
-    colorPrimary: '#8765D0',
-    colorSecondary: '#DED7F6',
-  },
+    subRole: false,
+  },
+  // BACK_OFFICE: {
+  //   id: 27,
+  //   name: 'Back office',
+  //   colorPrimary: '#8765D0',
+  //   colorSecondary: '#DED7F6',
+  //   subRole: false,
+  // },
+  // BACK_OFFICE_EXPRESS: {
+  //   id: 28,
+  //   name: 'Back office express',
+  //   colorPrimary: '#8765D0',
+  //   colorSecondary: '#DED7F6',
+  //   subRole: false,
+  // },
+  // BACK_MANAGER: {
+  //   id: 30,
+  //   name: 'Manager back',
+  //   colorPrimary: '#8765D0',
+  //   colorSecondary: '#DED7F6',
+  // subRole: false,
+  //   handledInUserSocietyPermissionTable: false,
+  // },
+  // FRONT_MANAGER: {
+  //   id: 31,
+  //   name: 'Manager front',
+  //   colorPrimary: '#8765D0',
+  //   colorSecondary: '#DED7F6',
+  // subRole: false,
+  // },
+  // CUSTOMER_SUCCESS_MANAGER: {
+  //   id: 32,
+  //   name: 'Customer success manager',
+  //   colorPrimary: '#5894EF',
+  //   colorSecondary: '#DAEEFC',
+  // subRole: false,
+  // handledInUserSocietyPermissionTable: false,
+  // },
+  // COMMERCIAL_MANAGER: {
+  //   id: 33,
+  //   name: 'Manager commercial',
+  //   colorPrimary: '#8765D0',
+  //   colorSecondary: '#DED7F6',
+  // subRole: false,
+  // },
   FACTURATION: {
     id: 34,
     name: 'Facturation',
     colorPrimary: '#8765D0',
     colorSecondary: '#DED7F6',
+    subRole: false,
   },
   HUMAN_RESSOURCES: {
     id: 35,
     name: 'Ressources humaines',
     colorPrimary: '#8765D0',
     colorSecondary: '#DED7F6',
+    subRole: false,
   },
   PARTNERED_ACCOUNTANT: {
     id: 36,
     name: 'Comptable partenaire',
     colorPrimary: '#8765D0',
     colorSecondary: '#DED7F6',
+    subRole: false,
   },
   FORECAST_MANAGER: {
     id: 38,
     name: 'Gestionnaire Prévisionnels',
     colorPrimary: '#8765D0',
     colorSecondary: '#DED7F6',
+    subRole: false,
   },
   TERMINATION_MANAGER: {
     id: 39,
     name: 'Gestionnaire Résiliations',
     colorPrimary: '#8765D0',
     colorSecondary: '#DED7F6',
+    subRole: false,
   },
   EXPRESS_MANAGER: {
     id: 40,
     name: 'Gestionnaire Express',
     colorPrimary: '#8765D0',
     colorSecondary: '#DED7F6',
+    subRole: false,
   },
   CONFLICT_MANAGER: {
     id: 41,
     name: 'Gestionnaire Conflits',
     colorPrimary: '#8765D0',
     colorSecondary: '#DED7F6',
+    subRole: false,
   },
   ATTESTATION_MANAGER: {
     id: 42,
     name: 'Gestionnaire Attestations',
     colorPrimary: '#8765D0',
     colorSecondary: '#DED7F6',
+    subRole: false,
   },
   JURIDICAL_SUPPORT: {
     id: 43,
     name: 'Support juridique',
     colorPrimary: '#8765D0',
     colorSecondary: '#DED7F6',
+    subRole: false,
+  },
+  INTERN: {
+    id: 44,
+    name: 'Stagiaire',
+    colorPrimary: '#FFF',
+    colorSecondary: '#FFF',
+    subRole: true,
+  },
+  ALTERNATE: {
+    id: 45,
+    name: 'Alternant',
+    colorPrimary: '#FFF',
+    colorSecondary: '#FFF',
+    subRole: true,
+  },
+  DIRECTOR: {
+    id: 46,
+    name: 'Directeur',
+    colorPrimary: '#FFF',
+    colorSecondary: '#FFF',
+    subRole: true,
   },
 };

package/ts/types/Enum/TaskResponseType.ts

@@ -24,6 +24,17 @@ export enum StateTask {
   REFUSED = 4,
 }
 
+export enum RoleAvailableForTask {
+  SOCIAL = Role.SOCIAL,
+  FACTURATION = Role.FACTURATION,
+  JURIDIC = Role.JURIDIC,
+  CUSTOMER_SUCCESS = Role.CUSTOMER_SUCCESS,
+  FRONT_OFFICE = Role.FRONT_OFFICE,
+  COMMERCIAL = Role.COMMERCIAL,
+  // BACK_MANAGER = Role.BACK_MANAGER,
+  EXPERT_ACCOUNTANT = Role.EXPERT_ACCOUNTANT,
+}
+
 export const TaskResponseType = {
   INTERN: {
     id: 1,
@@ -131,7 +142,7 @@ export const TaskResponseType = {
       {
         id: 10,
         label: 'Préparation d\'un bilan',
-        role: Role.BACK_MANAGER,
+        role: Role.MANAGER,
         deadline: Deadline,
         isForWholeRole: false,
         backToClient: false,
@@ -139,6 +150,17 @@ export const TaskResponseType = {
         responseType: null,
         description: 'Controle de la DADS.',
       },
+      {
+        id: 11,
+        label: 'Comptable express',
+        role: Role.FRONT_OFFICE_EXPRESS,
+        deadline: Deadline,
+        isForWholeRole: false,
+        backToClient: false,
+        goToCalendar: false,
+        responseType: null,
+        description: 'Est-ce que nous pouvons réaliser le bilan 2020 de ce client ?',
+      },
     ],
   },
   EXTERN: {
@@ -258,7 +280,7 @@ export const TaskResponseType = {
       {
         id: 14,
         label: 'Litige dossier',
-        role: Role.BACK_MANAGER,
+        role: Role.MANAGER,
         deadline: Deadline,
         isForWholeRole: false,
         backToClient: true,
@@ -266,6 +288,17 @@ export const TaskResponseType = {
         responseType: ResponseType.MAIL,
         description: 'Le client veut avoir une explication de bilan par le responsable comptable',
       },
+      {
+        id: 15,
+        label: 'Comptable express',
+        role: Role.FRONT_OFFICE_EXPRESS,
+        deadline: Deadline,
+        isForWholeRole: false,
+        backToClient: true,
+        goToCalendar: false,
+        responseType: ResponseType.MAIL,
+        description: 'Bilan express à envoyer au SIE.',
+      },
     ],
 
   },

package/ts/types/Enum/TimeCounterType.ts

@@ -5,25 +5,25 @@ export const TimeCounterType = {
     id: 1,
     label: 'OnBoarding',
     aberrantTime: 60,
-    limitedRoles: [Role.FRONT_OFFICE, Role.BACK_OFFICE],
+    limitedRoles: [Role.FRONT_OFFICE],
   },
   VAT: {
     id: 2,
     label: 'TVA',
     aberrantTime: 60,
-    limitedRoles: [Role.MANAGER, Role.EXPERT_ACCOUNTANT, Role.FRONT_OFFICE, Role.BACK_OFFICE],
+    limitedRoles: [Role.MANAGER, Role.EXPERT_ACCOUNTANT, Role.FRONT_OFFICE],
   },
   REVISION: {
     id: 3,
     label: 'Révision',
     aberrantTime: 120,
-    limitedRoles: [Role.MANAGER, Role.EXPERT_ACCOUNTANT, Role.FRONT_OFFICE, Role.BACK_OFFICE],
+    limitedRoles: [Role.MANAGER, Role.EXPERT_ACCOUNTANT, Role.FRONT_OFFICE],
   },
   FOLDER_REVIEW: {
     id: 4,
     label: 'Revue dossier',
     aberrantTime: 60,
-    limitedRoles: [Role.MANAGER, Role.EXPERT_ACCOUNTANT, Role.FRONT_OFFICE, Role.BACK_OFFICE],
+    limitedRoles: [Role.MANAGER, Role.EXPERT_ACCOUNTANT, Role.FRONT_OFFICE],
   },
   REPORTING: {
     id: 5,
@@ -65,7 +65,7 @@ export const TimeCounterType = {
     id: 11,
     label: 'Prévisionnel',
     aberrantTime: null,
-    limitedRoles: [Role.FRONT_OFFICE, Role.BACK_OFFICE],
+    limitedRoles: [Role.FRONT_OFFICE],
   },
   CERTIFICATE: {
     id: 12,
@@ -77,7 +77,7 @@ export const TimeCounterType = {
     id: 13,
     label: 'Mission complémentaire',
     aberrantTime: null,
-    limitedRoles: [Role.FRONT_OFFICE, Role.BACK_OFFICE],
+    limitedRoles: [Role.FRONT_OFFICE],
   },
   ORGANISATION: {
     id: 14,
@@ -119,7 +119,7 @@ export const TimeCounterType = {
     id: 20,
     label: 'Bilan',
     aberrantTime: 120,
-    limitedRoles: [Role.FRONT_OFFICE, Role.BACK_OFFICE, Role.FRONT_MANAGER, Role.BACK_MANAGER, Role.EXPERT_ACCOUNTANT],
+    limitedRoles: [Role.FRONT_OFFICE, Role.EXPERT_ACCOUNTANT],
   },
   PAYSLIP: {
     id: 21,

package/ts/types/Interface/api/task/QueryCountTask.ts

@@ -14,7 +14,7 @@ export class QueryCountTask {
   @ApiPropertyOptional()
   @IsOptional()
   @IsInt()
-  idRole?: number;
+  idService?: number;
 
   @ApiPropertyOptional()
   @IsOptional()

package/ts/types/Interface/api/task/QueryPaginatedTask.ts

@@ -5,6 +5,10 @@ import { ApiPropertyOptional } from '../../../../utils';
 import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
 
 export class QueryPaginatedTask {
+  @ApiPropertyOptional()
+  @IsOptional()
+  isIntern?: boolean;
+
   @ApiPropertyOptional()
   @IsOptional()
   @IsInt()
@@ -36,6 +40,11 @@ export class QueryPaginatedTask {
   @IsInt()
   idUser?: number;
 
+  @ApiPropertyOptional({ description: 'roles for filter tasks' })
+  @IsOptional()
+  @IsInt()
+  idService?: number;
+
   @ApiPropertyOptional({ description: 'user who terminate the task' })
   @IsOptional()
   @IsInt()

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

@@ -1,4 +1,5 @@
 import {
+  IsIn,
   IsNumber,
   IsOptional, IsString,
 } from 'class-validator';
@@ -26,4 +27,12 @@ export class ParamsGetAllCollaborators {
   @IsOptional()
   @IsNumber()
   idUser?: number[];
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString({
+    each: true,
+  })
+  @IsIn(['avatar', 'teams', 'businessLines'], { each: true })
+  include?: string[];
 }

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

@@ -1,4 +1,5 @@
-import { ApiProperty } from '../../../../utils';
+import { IsIn, IsOptional, IsString } from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
 
 export class QueryGetAllCollaborators {
   @ApiProperty({
@@ -8,4 +9,12 @@ export class QueryGetAllCollaborators {
     example: [1, 13],
   })
   idUser?: number[];
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString({
+    each: true,
+  })
+  @IsIn(['avatar', 'teams', 'businessLines'], { each: true })
+  include?: string[];
 }

package/ts/types/Interface/models/ITask.ts

@@ -16,7 +16,7 @@ export interface ITask {
   idSociety: number,
   description?: string | null,
   idRole?: number,
-  idUser?: number,
+  idService?: number,
   idMail?: number,
   deadlineAt: Date,
   idUserWhoProcessed?: number,
@@ -29,7 +29,7 @@ export interface ITask {
   userWhoCreated?: IUser;
   society?: ISociety;
   role?: IRole;
-  user?: IUser;
+  service?: IRole;
   userWhoProcessed?: IUser;
   userWhoRefused?: IUser;
   calendarEvent?: ICalendarEvent;

package/ts/utils/task.ts

@@ -1,8 +1,9 @@
 import { Role } from '../types/Enum/Role';
+import { TaskResponseType, RoleAvailableForTask } from '../types/Enum/TaskResponseType';
 
 const getIdRoleUsedForTask = (listRoles: number[]): number => {
   let idRole = 0;
-  if (listRoles.includes(Role.COMMERCIAL) || listRoles.includes(Role.COMMERCIAL_MANAGER)) {
+  if (listRoles.includes(Role.COMMERCIAL)) {
     idRole = Role.COMMERCIAL;
   } else if (listRoles.includes(Role.JURIDIC)) {
     idRole = Role.JURIDIC;
@@ -10,28 +11,35 @@ const getIdRoleUsedForTask = (listRoles: number[]): number => {
     idRole = Role.SOCIAL;
   } else if (listRoles.includes(Role.FACTURATION)) {
     idRole = Role.FACTURATION;
-  } else if (listRoles.includes(Role.CUSTOMER_SUCCESS) || listRoles.includes(Role.CUSTOMER_SUCCESS_MANAGER)) {
+  } else if (listRoles.includes(Role.CUSTOMER_SUCCESS)) {
     idRole = Role.CUSTOMER_SUCCESS;
-  } else if (listRoles.includes(Role.FRONT_OFFICE) || listRoles.includes(Role.FRONT_MANAGER)) {
+  } else if (listRoles.includes(Role.FRONT_OFFICE)) {
     idRole = Role.FRONT_OFFICE;
   }
   return idRole;
 };
 
-const getIdRoleUsedForManagerTask = (listRoles: number[]): number => {
-  let idRole = 0;
-  if (listRoles.includes(Role.COMMERCIAL)) {
-    idRole = Role.COMMERCIAL_MANAGER;
-  } else if (listRoles.includes(Role.JURIDIC) || listRoles.includes(Role.SOCIAL) || listRoles.includes(Role.FACTURATION)) {
-    idRole = Role.MANAGER;
-  } else if (listRoles.includes(Role.CUSTOMER_SUCCESS)) {
-    idRole = Role.CUSTOMER_SUCCESS_MANAGER;
-  } else if (listRoles.includes(Role.FRONT_OFFICE)) {
-    idRole = Role.FRONT_MANAGER;
-  }
-  return idRole;
+// const getIdRoleUsedForManagerTask = (listRoles: number[]): number => {
+//   let idRole = 0;
+//   if (listRoles.includes(Role.COMMERCIAL)) {
+//     idRole = Role.MANAGER;
+//   } else if (listRoles.includes(Role.JURIDIC) || listRoles.includes(Role.SOCIAL) || listRoles.includes(Role.FACTURATION)) {
+//     idRole = Role.MANAGER;
+//   } else if (listRoles.includes(Role.CUSTOMER_SUCCESS)) {
+//     idRole = Role.MANAGER;
+//   } else if (listRoles.includes(Role.FRONT_OFFICE)) {
+//     idRole = Role.MANAGER;
+//   }
+//   return idRole;
+// };
+
+const getIdRoleUsedForAttribution = (isIntern: boolean, idTaskType: number): number | undefined => {
+  const taskTypeList = isIntern ? TaskResponseType.INTERN.types : TaskResponseType.EXTERN.types;
+  return taskTypeList.find((taskType) => taskType.id === idTaskType)?.role;
 };
 
+const getIdRoleUsedForGetTaskOfUser = (idRole: number): boolean => !!Object.values(RoleAvailableForTask).find((role) => role === idRole);
+
 export {
-  getIdRoleUsedForTask, getIdRoleUsedForManagerTask,
+  getIdRoleUsedForTask, getIdRoleUsedForAttribution, getIdRoleUsedForGetTaskOfUser,
 };

package/ts/utils/webmail.ts

@@ -4,13 +4,11 @@ const getIdRoleUsedForEmail = (listRoles: number[]): number => {
   let idRole = Role.CUSTOMER_SUCCESS;
   if (listRoles.includes(Role.FACTURATION)) {
     idRole = Role.FACTURATION;
-  } else if (listRoles.includes(Role.BACK_MANAGER)) {
-    idRole = Role.BACK_MANAGER;
   } else if (listRoles.includes(Role.FRONT_OFFICE)) {
     idRole = Role.FRONT_OFFICE;
   } else if (listRoles.includes(Role.FRONT_OFFICE_EXPRESS)) {
     idRole = Role.FRONT_OFFICE_EXPRESS;
-  } else if (listRoles.includes(Role.COMMERCIAL) || listRoles.includes(Role.COMMERCIAL_MANAGER)) {
+  } else if (listRoles.includes(Role.COMMERCIAL)) {
     idRole = Role.COMMERCIAL;
   } else if (listRoles.includes(Role.EXPERT_ACCOUNTANT)) {
     idRole = Role.EXPERT_ACCOUNTANT;