@silexpert/core 1.1.190 → 1.1.192

package/ts/types/Enum/PriceGridPourcentage.ts

@@ -17,7 +17,7 @@ export const PriceGridPourcentage = [
           },
           {
             id: ClosingType.OUTDATED,
-            month: 16,
+            month: 12,
           },
         ],
         maximumMonthlyPayment: [
@@ -85,7 +85,7 @@ export const PriceGridPourcentage = [
           },
           {
             id: ClosingType.OUTDATED,
-            month: 16,
+            month: 12,
           },
         ],
         maximumMonthlyPayment: [
@@ -203,7 +203,7 @@ export const PriceGridPourcentage = [
           },
           {
             id: ClosingType.OUTDATED,
-            month: 16,
+            month: 12,
           },
         ],
         maximumMonthlyPayment: [
@@ -271,7 +271,7 @@ export const PriceGridPourcentage = [
           },
           {
             id: ClosingType.OUTDATED,
-            month: 16,
+            month: 12,
           },
         ],
         maximumMonthlyPayment: [
@@ -389,7 +389,7 @@ export const PriceGridPourcentage = [
           },
           {
             id: ClosingType.OUTDATED,
-            month: 16,
+            month: 12,
           },
         ],
         maximumMonthlyPayment: [
@@ -457,7 +457,7 @@ export const PriceGridPourcentage = [
           },
           {
             id: ClosingType.OUTDATED,
-            month: 16,
+            month: 12,
           },
         ],
         maximumMonthlyPayment: [
@@ -575,7 +575,7 @@ export const PriceGridPourcentage = [
           },
           {
             id: ClosingType.OUTDATED,
-            month: 16,
+            month: 12,
           },
         ],
         maximumMonthlyPayment: [
@@ -643,7 +643,7 @@ export const PriceGridPourcentage = [
           },
           {
             id: ClosingType.OUTDATED,
-            month: 16,
+            month: 12,
           },
         ],
         maximumMonthlyPayment: [
@@ -761,7 +761,7 @@ export const PriceGridPourcentage = [
           },
           {
             id: ClosingType.OUTDATED,
-            month: 16,
+            month: 12,
           },
         ],
         maximumMonthlyPayment: [
@@ -829,7 +829,7 @@ export const PriceGridPourcentage = [
           },
           {
             id: ClosingType.OUTDATED,
-            month: 16,
+            month: 12,
           },
         ],
         maximumMonthlyPayment: [
@@ -947,7 +947,7 @@ export const PriceGridPourcentage = [
           },
           {
             id: ClosingType.OUTDATED,
-            month: 16,
+            month: 12,
           },
         ],
         maximumMonthlyPayment: [
@@ -1015,7 +1015,7 @@ export const PriceGridPourcentage = [
           },
           {
             id: ClosingType.OUTDATED,
-            month: 16,
+            month: 12,
           },
         ],
         maximumMonthlyPayment: [

package/ts/types/Enum/Room.ts

@@ -0,0 +1,3 @@
+export enum Room {
+  // TODO: Add rooms
+}

package/ts/types/Interface/api/contest/Create.ts

@@ -66,7 +66,7 @@ export class CreateCheckVote {
 
 export class CreateVoteContest {
   @ApiProperty()
-    emailHash: string;
+    hashMail: string;
 
   @ApiProperty()
     userHash: string;

package/ts/types/Interface/api/contest/Query.ts

@@ -6,6 +6,12 @@ export class QueryFetchUserContest {
   @ApiPropertyOptional()
     search?: string;
 
+  @ApiPropertyOptional()
+    page?: number;
+
+  @ApiPropertyOptional()
+    limit?: number;
+
   @ApiPropertyOptional()
     orderBy?: string;
   
@@ -16,5 +22,5 @@ export class QueryFetchUserContest {
     top?: boolean | null;
 
   @ApiPropertyOptional()
-    idToExclude?: number;
+    idToPutFirst?: number;
 }

package/ts/types/Interface/api/customerSignature/Query.ts

@@ -0,0 +1,89 @@
+import { IsDate, IsInt, IsOptional, IsString } from 'class-validator';
+import { ApiPropertyOptional } from '../../../../utils';
+
+export class QueryCustomerSignature {
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+    id?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+    idDemand?: number;
+    
+  @ApiPropertyOptional()
+  @IsOptional() 
+  @IsInt()
+    idFileFilesInfos?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+    fileNameFilesInfos?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+    sha1FilesInfos?: string;  
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+    memberId?: number;  
+  
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+    tokenSigner?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+    mailSigner?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+    phoneSigner?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+    idSendMethod?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+    idStatusSignature?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+    idPrestation?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+    idUser?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+    idCollaborater?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+    idGedFile?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsDate()
+    dateSendPlaqToClient?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString({ each: true })
+    includes?: string[];
+}

package/ts/types/Interface/api/equipment/Query.ts

@@ -0,0 +1,75 @@
+import { IsDate, IsInt, IsOptional, IsString } from 'class-validator';
+import { ApiPropertyOptional } from '../../../../utils';
+import { RequiredQueryPaginate } from '../BasePaginate';
+
+export class QueryEquipment extends RequiredQueryPaginate {
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+    id?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+    search?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+    idUser?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+    equipmentState?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+    availability?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+    signatureStatus?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+    reference?: string | null;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+    brand?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+    type?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+    supplier?: string | null;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+    price?: number | null;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+    comment?: string | null;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsDate()
+    destroyedAt?: Date;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsDate()
+    lostAt?: Date;
+}

package/ts/types/Interface/api/equipment/StockAmount.ts

@@ -0,0 +1,9 @@
+export type StockAmount = {
+  id: number;
+  label: string;
+  totalAmount: number;
+  totalAmountNotInStock: number;
+  totalAmountBroken: number;
+  totalAmountLost: number;
+  totalAmountInStock: number;
+};

package/ts/types/Interface/api/userRoomEquipment/BulkUpdate.ts

@@ -0,0 +1,9 @@
+import { IsArray } from 'class-validator';
+import { ApiProperty } from '../../../../utils';
+import { IUserRoomEquipment } from '../../models/IUserRoomEquipment';
+
+export class BulkUpdateMovement {
+  @ApiProperty()
+  @IsArray()
+    userRoomEquipments: IUserRoomEquipment[];
+}

package/ts/types/Interface/api/userRoomEquipment/CreateSignature.ts

@@ -0,0 +1,12 @@
+import { IsInt } from 'class-validator';
+import { ApiProperty } from '../../../../utils';
+
+export class CreateYousignSignature {
+  @ApiProperty()
+  @IsInt({ each: true })
+    idUserRoomEquipments: number[];
+
+  @ApiProperty()
+  @IsInt()
+    idUserToSign: number;
+}

package/ts/types/Interface/api/userRoomEquipment/Query.ts

@@ -0,0 +1,40 @@
+import { IsBoolean, IsDate, IsInt, IsOptional  } from 'class-validator';
+import { ApiPropertyOptional } from '../../../../utils';
+import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
+
+export class QueryUserRoomEquipment {
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+    id?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+    idEquipment?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+    idUser?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+    idRoom?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+    isRemote?: boolean;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsDate()
+    inAt?: Date;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+    outAt?: string | null;
+}

package/ts/types/Interface/models/ICustomerSignature.ts

@@ -2,22 +2,24 @@ import { IUser } from './IUser';
 import { IStatusSignature } from './IStatusSignature';
 import { IPrestation } from './IPrestation';
 import { IGedFile } from './IGedFile';
+import { IUserRoomEquipment } from './IUserRoomEquipment';
 
 // customersSignatures
 export interface ICustomerSignature {
   id?: number;
-  idDemand: string;
+  idDemand?: string;
   idFileFilesInfos: string;
   fileNameFilesInfos: string;
   sha1FilesInfos?: string | null;
-  memberId: string;
+  memberId?: string;
   tokenSigner: string;
   mailSigner: string;
   phoneSigner: string;
   idSendMethod: number;
   idStatusSignature: number;
   idPrestation?: number;
-  idUser: number | null;
+  idUser?: number | null;
+  idCollaborater?: number | null;
   idGedFile?: number;
   dateSendPlaqToClient: Date | null;
   createdAt?: Date | null;
@@ -25,7 +27,9 @@ export interface ICustomerSignature {
 
   // Associations
   user?: IUser;
+  collaborater?: IUser;
   statusSignature?: IStatusSignature;
   prestation?: IPrestation;
   gedFile?: IGedFile;
+  userRoomEquipments?: IUserRoomEquipment[];
 }

package/ts/types/Interface/models/IEquipment.ts

@@ -0,0 +1,21 @@
+import { EquipmentType } from '../../Enum/EquipmentType';
+import { IUserRoomEquipment } from '././IUserRoomEquipment';
+
+export interface IEquipment {
+  id?: number;
+  reference?: string | null;
+  brand: string;
+  type: EquipmentType;
+  supplier?: string | null;
+  price?: number | null;
+  comment?: string | null;
+  destroyedAt?: Date | null;
+  lostAt?: Date | null;
+  soldAt?: Date | null;
+  createdAt?: Date | null;
+  updatedAt?: Date | null;
+  deletedAt?: Date | null;
+
+  // Associations
+  userRoomEquipments?: IUserRoomEquipment[];
+}

package/ts/types/Interface/models/IFile.ts

@@ -18,5 +18,5 @@ export interface IFile {
   attachmentFile?: IAttachmentFile;
   folderFile?: IFolderFile;
   fileType?: IFileType;
-  commercialMails?: ICommercialMail[]
+  commercialMails?: ICommercialMail[];
 }

package/ts/types/Interface/models/IUserRoomEquipment.ts

@@ -0,0 +1,22 @@
+import { ICustomerSignature, IUser } from '../..';
+import { IEquipment } from './IEquipment';
+
+export interface IUserRoomEquipment {
+  id?: number;
+  idEquipment: number;
+  idUser?: number | null;
+  idRoom?: number | null;
+  idCustomerSignature?: number | null;
+  idFile?: number | null;
+  isRemote?: boolean | null;
+  inAt?: Date | null;
+  outAt?: Date | null;
+  createdAt?: Date | null;
+  updatedAt?: Date | null;
+  deletedAt?: Date | null;
+
+  // Associations
+  equipment?: IEquipment;
+  user?: IUser
+  customerSignature?: ICustomerSignature;
+}

package/ts/types/Interface/models/IVoteContest.ts

@@ -3,7 +3,7 @@ import { IUser } from '../..';
 export interface IVoteContest {
   id?: number;
   emailVoter: string;
-  emailHash: string;
+  hashMail: string;
   ipAddress: string;
   hasVoteBeenCompleted: boolean
   idUserVoteFor?: number | null;

package/ts/types/index.ts

@@ -322,6 +322,8 @@ export * from './Interface/models/ICardHistory';
 export * from './Interface/models/IDubiousCustomer';
 export * from './Interface/models/IUserContest';
 export * from './Interface/models/IVoteContest';
+export * from './Interface/models/IEquipment';
+export * from './Interface/models/IUserRoomEquipment';
 
 
 // Schemas
@@ -513,6 +515,10 @@ export * from './Enum/VatControl';
 export * from './Enum/Cycle';
 export * from './Enum/Card';
 export * from './Enum/TimeTrackingSource';
+export * from './Enum/EquipmentType';
+export * from './Enum/Room';
+export * from './Enum/EquipmentState';
+export * from './Enum/EquipmentAvailability';
 
 // Interfaces API
 export * from './Interface/api/kilometricAllowance/ReadKilometricAllowance';
@@ -1004,6 +1010,13 @@ export * from './Interface/api/IntermediateManagementRebate';
 export * from './Interface/api/contest/Create';
 export * from './Interface/api/contest/Query';
 export * from './Interface/api/contest/Read';
+export * from './Interface/api/equipment/Query';
+export * from './Interface/api/userRoomEquipment/Query';
+export * from './Interface/api/equipment/StockAmount';
+export * from './Interface/api/userRoomEquipment/BulkUpdate';
+export * from './Interface/api/customerSignature/Query';
+export * from './Interface/api/userRoomEquipment/CreateSignature';
+
 // Enums types
 export * from './Interface/enum/Util';
 export * from './Interface/enum/Date';

package/ts/utils/index.ts

@@ -20,3 +20,4 @@ export * from './isUrl';
 export { getCerfa3517DDRRegistrationField } from './vat/3517/century23';
 export * from './bankAccount';
 export * from './commercialOffer';
+export * from './subscription';

package/ts/utils/stringUtils/clean.ts

@@ -1,12 +1,12 @@
 const wordsToExclude = ['cheque', 'prelevement', 'cheques', 'prelevements', 'prlvt', 'prlv', 'valeur', 'euro', 'solde', 'dont'];
-export const minWordsForDesignation = 3;
+export const minWordsForDesignation = 2;
 
 export function cleanForRules(string: string) : string {
   return string
     .toLowerCase()
     .replace(/[^a-z0-9 ]/gi, '') // Conservation des espaces & caractères alphanumérique
     .split(' ')
-    .filter((str) => str.length >= minWordsForDesignation && !wordsToExclude.includes(str)) // Suppression des mots à exclure et désignation inférieur à 3 char
+    .filter((str) => str.length >= minWordsForDesignation && !wordsToExclude.includes(str)) // Suppression des mots à exclure et désignation inférieur à minWordsForDesignation char
     .join(' ')
     .replace(/[^a-z]/gi, ''); // Conservation des caractères alphanumérique
 }

package/ts/utils/subscription.ts

@@ -0,0 +1,130 @@
+import { ComptaType } from '../types/Enum/ComptaType';
+import { LegalFormTypeEnum } from '../types/Enum/LegalForm';
+import { TaxSystem } from '../types/Enum/TaxSystem';
+
+interface OfferParams {
+  idLegalForm: LegalFormTypeEnum | null;
+  idComptaType: ComptaType | null;
+  idTaxSystem: TaxSystem | null;
+  isYearly?: boolean;
+}
+
+interface StripeOffer {
+  name: string;
+  isYearly: boolean;
+  isMicro: boolean;
+  key: string;
+  isCashBased: boolean;
+  isSocietyTax?: boolean;
+}
+
+const isTestKey: boolean = ['dev', 'staging', 'development', 'test'].includes(process.env.NODE_ENV ?? '');
+
+// AE | Annuel | Forfait Bilan complet
+const ID_SUBSCRIPTION_MICRO_ANNUAL = !isTestKey
+  ? 'price_1MTiBJIHo1jEedppqXmN5hWm'
+  : 'price_1MRyi1IHo1jEedppRKdY06Re';
+
+// AE | Mensuel | Forfait Bilan complet
+const ID_SUBSCRIPTION_MICRO_MENSUAL = !isTestKey
+  ? 'price_1LBJ4xIHo1jEedppylxr3fFa'
+  : 'price_1LBI57IHo1jEedpppnxskfgv';
+
+// Entreprise | Annuel | Forfait entreprise à l'IR
+const ID_SUBSCRIPTION_INCOME_TAX_ANNUAL = !isTestKey
+  ? 'price_1MRvtdIHo1jEedppjwsDQVI3'
+  : 'price_1MRyiJIHo1jEedppUe7MnPtW';
+
+// Entreprise | Mensuel | Forfaitentreprise à l'IR
+const ID_SUBSCRIPTION_INCOME_TAX_MENSUAL = !isTestKey
+  ? 'price_1LBJ5YIHo1jEedppzwTErh9M'
+  : 'price_1LBIA3IHo1jEedpp2taeQ7yW';
+
+// Entreprise | Annuel | Forfait entreprise à l'IS
+const ID_SUBSCRIPTION_SOCIETY_TAX_ANNUAL = !isTestKey
+  ? 'price_1MRvuMIHo1jEedppeyccVLLl'
+  : 'price_1MRyiWIHo1jEedppp5tnksZe';
+
+// Entreprise | Mensuel | Forfait entreprise à l'IS
+const ID_SUBSCRIPTION_SOCIETY_TAX_MENSUAL = !isTestKey
+  ? 'price_1LBJ69IHo1jEedppAWLeOk3I'
+  : 'price_1LBIB7IHo1jEedppocxyc1ft';
+
+const list: StripeOffer[] = [
+  {
+    name: 'Offre auto-entrepreneur',
+    isYearly: true,
+    isMicro: true,
+    key: ID_SUBSCRIPTION_MICRO_ANNUAL,
+    isCashBased: true,
+    isSocietyTax: false,
+  },
+  {
+    name: 'Offre auto-entrepreneur',
+    isYearly: false,
+    isMicro: true,
+    key: ID_SUBSCRIPTION_MICRO_MENSUAL,
+    isCashBased: true,
+    isSocietyTax: false,
+  },
+  {
+    name: 'Offre entreprise IS',
+    isYearly: true,
+    isMicro: false,
+    key: ID_SUBSCRIPTION_SOCIETY_TAX_ANNUAL,
+    isCashBased: false,
+    isSocietyTax: true,
+  },
+  {
+    name: 'Offre entreprise IS',
+    isMicro: false,
+    isYearly: false,
+    key: ID_SUBSCRIPTION_SOCIETY_TAX_MENSUAL,
+    isCashBased: false,
+    isSocietyTax: true,
+  },
+  {
+    name: 'Offre entreprise IR',
+    isMicro: false,
+    isYearly: true,
+    isCashBased: true,
+    isSocietyTax: false,
+    key: ID_SUBSCRIPTION_INCOME_TAX_ANNUAL,
+  },
+  {
+    name: 'Offre entreprise IR',
+    isMicro: false,
+    isYearly: false,
+    key: ID_SUBSCRIPTION_INCOME_TAX_MENSUAL,
+    isCashBased: true,
+    isSocietyTax: false,
+  },
+];
+
+export function getDefaultOffer(params: OfferParams): StripeOffer {
+  const { idLegalForm, idComptaType, isYearly, idTaxSystem } = params;
+
+  const isMicro = LegalFormTypeEnum.AUTO_ENTREPRENEUR === idLegalForm;
+  const isCashBased = idComptaType
+    ? [
+      ComptaType.CASH_BASED,
+      ComptaType.CASH_BASED_ASSISTANCE,
+      ComptaType.CASH_BASED_SEIZURE,
+    ].includes(idComptaType)
+    : false;
+  const isSocietyTax = idTaxSystem === TaxSystem.IS;
+
+  const newPlan = list.find(
+    (l) =>
+      l.isMicro === isMicro &&
+      l.isYearly === isYearly &&
+      l.isCashBased === isCashBased &&
+      l.isSocietyTax === isSocietyTax,
+  );
+
+  if (newPlan) {
+    return newPlan;
+  }
+
+  return isYearly ? list[2] : list[3];
+}