@silexpert/core 0.4.239 → 0.4.241

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

@@ -1,36 +1,22 @@
 import {
   IsBoolean,
-  IsInt,
   IsOptional,
 } from 'class-validator';
-import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
+import { WhereOptions, WhereValue } from 'sequelize';
+import { Mail } from '../../../../api/resources/Mail';
+import { ApiPropertyOptional } from '../../../../utils';
 import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
 
 export class QueryCountMail {
-  @ApiProperty()
-  @IsInt()
-  idUser: number;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsBoolean()
-  @ToBoolean()
-  isWithoutSociety?: boolean;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsBoolean()
-  @ToBoolean()
-  isSent?: boolean;
-
   @ApiPropertyOptional()
   @IsOptional()
   @IsBoolean()
   @ToBoolean()
-  isCountingManagerRoleMails?: boolean;
+  distinct?: boolean;
 
   @ApiPropertyOptional()
   @IsOptional()
-  @IsInt({ each: true })
-  listIdSocieties?: number[];
+  where?: {
+    [K in keyof Mail]?: WhereOptions | WhereValue
+  };
 }

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

@@ -0,0 +1,25 @@
+import {
+  IsBoolean,
+  IsInt,
+  IsOptional,
+} from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
+import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
+
+export class QueryCountUnprocessedByUserMail {
+  @ApiProperty()
+  @IsInt()
+  idUser: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  isWithoutSociety?: boolean;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  isCountingManagerRoleMails?: boolean;
+}

package/ts/types/index.ts

@@ -480,6 +480,7 @@ export * from './Interface/api/mail/QueryPaginatedMail';
 export * from './Interface/api/mail/QueryCountProcessedByUser';
 export * from './Interface/api/mail/QueryGetAnsweringTimeByUser';
 export * from './Interface/api/mail/QueryCountMail';
+export * from './Interface/api/mail/QueryCountUnprocessedByUserMail';
 export * from './Interface/api/mail/UpdateMail';
 export * from './Interface/api/mail/CreateMailParams';
 export * from './Interface/api/mail/UpdateMailParams';
@@ -758,6 +759,7 @@ export * from './Interface/enum/Date';
 
 export * from '../utils/cerfa';
 export * from '../utils/checklist';
+export * from '../utils/date';
 export * from './Interface/api/affectedPatrimony/CreateAffectedPatrimony';
 export * from './Interface/api/affectedPatrimony/CreateInKindAffectedPatrimony';
 export * from './Interface/api/affectedPatrimony/ResultCreateAffectedPatrimony';

package/ts/utils/date.ts

@@ -0,0 +1,32 @@
+/**
+ * @param dateStart (format YYYY-MM-DD)
+ * @param dateEnd (format YYYY-MM-DD)
+ * @returns object of date (09:00-10:00, 12:00-13:00 et 14:00-17:00)
+ */
+import * as dayjs from 'dayjs';
+import * as isBetween from 'dayjs/plugin/isBetween';
+import { ReadAttendanceHours, UpdateCalendarEvent } from '../types';
+
+dayjs.extend(isBetween);
+
+export async function checkRealHoursUser(customPayload: UpdateCalendarEvent, realHours: ReadAttendanceHours):Promise<UpdateCalendarEvent> {
+  const res = { ...customPayload };
+  if (realHours.datas.length > 0) {
+    const dateToCompareStart = dayjs(customPayload.dateStart).toDate();
+    const dateToCompareEnd = dayjs(customPayload.dateEnd).toDate();
+    const realHoursObject = realHours.datas;
+
+    // on cherche la bonne specialhour pour comparer les horaires
+    const realHoursOfPeriod = realHoursObject.filter((sh) => (sh.endTime && dayjs(dateToCompareStart).diff(dayjs(sh.endTime)) <= 0) && (sh.startTime && dayjs(dateToCompareEnd).diff(dayjs(sh.startTime)) >= 0));
+
+    if (realHoursOfPeriod?.length > 0 && realHoursOfPeriod[0].startTime && realHoursOfPeriod[0].endTime) {
+      const dateStart = dayjs(realHoursOfPeriod[0].startTime, 'YYYY-MM-DD HH:mm:ss').toDate();
+      const dateEnd = dayjs(realHoursOfPeriod[0].endTime, 'YYYY-MM-DD HH:mm:ss').toDate();
+
+      // on check si les horaires de l'event sont dans les horaires du collab sinon on les fait commencer à l'heure à laquelle il s'est connecté
+      res.dateStart = !(dayjs(dateToCompareStart).isBetween(dateStart, dateEnd, 'minutes', '[]')) ? dateStart : dateToCompareStart;
+      res.dateEnd = !(dayjs(dateToCompareEnd).isBetween(dateStart, dateEnd, 'minutes', '[]')) ? dateEnd : dateToCompareEnd;
+    }
+  }
+  return res;
+}

package/ts/utils/webmail.ts

@@ -2,7 +2,9 @@ import { Role } from '../types/Enum/Role';
 
 const getIdRoleUsedForEmail = (listRoles: number[]): number => {
   let idRole = Role.CUSTOMER_SUCCESS;
-  if (listRoles.includes(Role.FRONT_OFFICE)) {
+  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;
@@ -16,8 +18,6 @@ const getIdRoleUsedForEmail = (listRoles: number[]): number => {
     idRole = Role.JURIDIC;
   } else if (listRoles.includes(Role.SOCIAL)) {
     idRole = Role.SOCIAL;
-  } else if (listRoles.includes(Role.BACK_MANAGER)) {
-    idRole = Role.BACK_MANAGER;
   }
   return idRole;
 };