@silexpert/core 1.3.158-18 → 1.3.158-2

package/ts/types/Interface/api/payment/Params.ts

@@ -1,4 +1,4 @@
-import { IsBoolean, IsDate, IsInt, IsNumber, IsOptional, IsString, Matches, Min } from 'class-validator';
+import { IsBoolean, IsDate, IsInt, IsNumber, IsOptional, IsString, Matches } from 'class-validator';
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
 import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
 
@@ -9,10 +9,9 @@ export class CreatePaymentsAutoBilling {
   idSociety?: number;
 }
 export class CreatePaymentsRebilling {
-  @ApiPropertyOptional()
-  @IsOptional()
+  @ApiProperty()
   @IsInt()
-  idSociety?: number;
+  idSociety: number;
 
   @ApiPropertyOptional()
   @IsOptional()
@@ -26,17 +25,6 @@ export class CreatePaymentsRebilling {
   @IsOptional()
   @IsInt()
   nbExercicesToGenerate?: number = 1;
-
-  @ApiProperty({ default: 10 })
-  @IsInt()
-  @Min(1)
-  limit?: number = 10;
-
-  @ApiPropertyOptional({ default: false })
-  @IsOptional()
-  @IsBoolean()
-  @ToBoolean()
-  debug?: boolean = false;
 }
 
 export class UpdateCollectable {
@@ -127,9 +115,4 @@ export class UpdatePayment {
   @IsOptional()
   @IsDate()
   datePayment?: Date;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsDate()
-  creditLossAt?: Date;
 }

package/ts/types/Interface/api/report/CreateReport.ts

@@ -4,12 +4,9 @@ import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
 import { TFile } from '../file/TFile';
 
 export class CreateReport implements IReport {
-  @ApiProperty()
-  @IsInt()
-  idSource: number;
-
   @ApiPropertyOptional()
   @IsOptional()
+  @IsInt({ each: true })
   idReportType?: number[];
 
   @ApiPropertyOptional()
@@ -71,10 +68,6 @@ export class CreateReport implements IReport {
   @IsOptional()
   letterDate?: Date;
 
-  @ApiPropertyOptional()
-  @IsOptional()
-  receivedAt?: Date;
-
   @ApiPropertyOptional()
   @IsOptional()
   receivedFile?: TFile;

package/ts/types/Interface/api/report/ExternalReport.ts

@@ -1,7 +1,7 @@
 import { IsEnum, IsInt, IsNumber, IsOptional, IsString } from 'class-validator';
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
 import { IssueTypeEnum } from '../../../Enum/IssueType';
-import { ReportTypeEnum } from '../../../Enum/ReportType';
+//import { ReportTypeEnum } from '../../../Enum/ReportType';
 import { TFile } from '../file/TFile';
 
 export class CreateExternalReport {
@@ -13,9 +13,9 @@ export class CreateExternalReport {
 
   @ApiPropertyOptional()
   @IsOptional()
-  @IsInt()
-  @IsEnum(ReportTypeEnum)
-  idReportType?: number;
+  //@IsInt({ each: true })
+  //@IsEnum(ReportTypeEnum)
+  idReportType?: number[];
 
   @ApiProperty()
   @IsNumber()

package/ts/types/Interface/api/report/QueryReports.ts

@@ -1,11 +1,8 @@
-import { IsBoolean, IsDateString, IsOptional } from 'class-validator';
+import { IsBoolean, IsOptional } from 'class-validator';
 import { ApiPropertyOptional } from '../../../../utils';
 import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
 
 export class QueryReports {
-  @ApiPropertyOptional()
-  idSource?: number[];
-
   @ApiPropertyOptional()
   idReportType?: number[];
 
@@ -15,9 +12,6 @@ export class QueryReports {
   @ApiPropertyOptional()
   idService?: number;
 
-  @ApiPropertyOptional()
-  idUserConcerned?: number;
-
   @ApiPropertyOptional()
   idServiceConcerned?: number;
 
@@ -41,14 +35,4 @@ export class QueryReports {
   @IsBoolean()
   @ToBoolean()
   onlyClient?: boolean;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsDateString()
-  declare startDate?: string;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsDateString()
-  declare endDate?: string;
 }

package/ts/types/Interface/api/report/UpdateReport.ts

@@ -1,93 +1,13 @@
-import { IReport } from '../../..';
-import { ApiPropertyOptional } from '../../../../utils';
-import { IsBoolean, IsDateString, IsInt, IsOptional, IsString } from 'class-validator';
-import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
+import { IReport, IUser } from '../../..';
 
-export class UpdateReport implements IReport {
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsInt()
-  idSource: number;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  idReportType?: number[];
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsInt()
-  idSociety?: number;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsInt()
-  idFile?: number;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsInt()
-  idUser: number;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsInt()
-  idServiceConcerned?: number;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsString()
-  comment: string;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsString()
-  search?: string;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsBoolean()
-  @ToBoolean()
+export interface UpdateReport extends IReport {
+  comment?: string;
+  note?: string;
   declareSoupcons?: boolean;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsInt()
   state?: number;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsBoolean()
-  @ToBoolean()
   informerjlb?: boolean;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsInt()
   ressenti?: number;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsInt()
   action?: number;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsBoolean()
-  @ToBoolean()
-  processed?: boolean;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsDateString()
-  letterDate?: Date;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsDateString()
-  receivedAt?: Date;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsString()
-  token?: string;
+  idReport?: number;
+  societyUsers?: IUser[];
 }

package/ts/types/Interface/api/revenueMovement.ts

@@ -0,0 +1,113 @@
+import { RevenueMovementType } from '../../Enum/Revenue';
+
+/**
+ * DTO pour créer un mouvement de revenu
+ */
+export interface ICreateRevenueMovementRequest {
+  type: RevenueMovementType;
+  idSociety: number;
+  idExercice?: number;
+  idPrestation?: number;
+  idTerminationList?: number;
+  idChurnMovement?: number;
+  amount: number;
+  mrr: number;
+  arr: number;
+  movementDate: Date;
+  description?: string;
+  metadata?: Record<string, any>;
+}
+
+/**
+ * DTO pour mettre à jour un mouvement de revenu
+ */
+export interface IUpdateRevenueMovementRequest {
+  type?: RevenueMovementType;
+  idTerminationList?: number;
+  idChurnMovement?: number;
+  amount?: number;
+  mrr?: number;
+  arr?: number;
+  movementDate?: Date | string;
+  description?: string;
+  metadata?: Record<string, any>;
+}
+
+/**
+ * Filtres pour récupérer les mouvements de revenu
+ */
+export interface IGetRevenueMovementsRequest {
+  idSociety?: number;
+  idExercice?: number;
+  idPrestation?: number;
+  idTerminationList?: number;
+  idChurnMovement?: number;
+  type?: RevenueMovementType[];
+  startDate?: Date | string;
+  endDate?: Date | string;
+  page?: number;
+  limit?: number;
+}
+
+/**
+ * Réponse paginée pour les mouvements de revenu
+ */
+export interface IGetRevenueMovementsResponse {
+  movements: any[]; // IRevenueMovement[]
+  total: number;
+  page: number;
+  limit: number;
+  totalPages: number;
+}
+
+/**
+ * DTO pour générer un snapshot de revenu
+ */
+export interface IGenerateSnapshotRequest {
+  date?: string;
+  idSociety?: number;
+  idExercice?: number;
+}
+
+/**
+ * DTO pour générer tous les snapshots de revenu
+ */
+export interface IGenerateAllSnapshotsRequest {
+  date?: string;
+}
+
+/**
+ * DTO pour gérer la rétroactivité des mouvements de revenu
+ */
+export interface IManageRetroactivityRequest {
+  idSociety: number;
+  idExercice?: number;
+}
+
+/**
+ * Réponse pour la gestion de la rétroactivité
+ */
+export interface IManageRetroactivityResponse {
+  idSociety: number;
+  idExercice: number;
+  exerciceStartDate: Date;
+  exerciceEndDate: Date;
+  movementsCreated: {
+    bookings: number;
+    churns: number;
+    recognitions: number;
+    provisions: number;
+    mothballingBookings: number;
+  };
+  prestationsProcessed: number;
+  monthsProcessed: number;
+  details: {
+    type: string;
+    idPrestation?: number;
+    prestationName?: string;
+    date: Date;
+    amount: number;
+    mrr: number;
+    arr: number;
+  }[];
+}

package/ts/types/Interface/api/{revenue/revenueSnapshot.ts → revenueSnapshot.ts}

@@ -52,10 +52,8 @@ export interface IGetArrSummaryResponse {
   timeline: Array<{
     date: Date;
     arr: number;
-    // mrr: number;
+    mrr: number;
     bookings: number;
     churn: number;
-    recognition: number;
-    provision: number;
   }>;
 }

package/ts/types/Interface/api/{revenue/revenueSnapshotGenerate.ts → revenueSnapshotGenerate.ts}

@@ -1,5 +1,5 @@
-import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
-import { IsOptional, IsString, IsNumber, IsInt } from 'class-validator';
+import { ApiProperty } from '../../../utils';
+import { IsOptional, IsString, IsNumber } from 'class-validator';
 
 export class GenerateSnapshot {
   @ApiProperty({
@@ -42,20 +42,20 @@ export class GenerateAllSnapshots {
 }
 
 export class ManageRetroactivity {
-  // @ApiProperty({
-  //   required: true,
-  //   description: 'ID de la société',
-  //   example: 60170,
-  // })
-  // @IsInt()
-  // idSociety: number;
+  @ApiProperty({
+    required: true,
+    description: 'ID de la société',
+    example: 60170,
+  })
+  @IsNumber()
+  idSociety: number;
 
-  @ApiPropertyOptional({
+  @ApiProperty({
     required: false,
     description: "ID de l'exercice (si non fourni, utilise l'exercice courant)",
     example: 123456,
   })
   @IsOptional()
-  @IsInt()
+  @IsNumber()
   idExercice?: number;
 }

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

@@ -23,6 +23,5 @@ export type ReadAskOrRequiredDocuments = {
   idExercice?: number;
   idBalanceSheet?: number;
   idBankAccount?: number;
-  idBusinessPartner?: number;
   gedFiles: IGedFile[];
 };

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

@@ -15,7 +15,6 @@ import { Civility } from '../../../Enum/Civility';
 import { IAnalyticsUtm } from '../../models/IAnalyticsUtm';
 import { LegalFormTypeEnum } from '../../../Enum/LegalForm';
 import { UpdateOrCreateVisualizedInformation } from '../visualizedInformation/Update';
-import { IPermission } from '../../models/IPermission';
 
 /**
  * Response of the register prospect endpoint
@@ -45,8 +44,6 @@ export interface ProspectSocietyInfo {
   idLegalForm?: LegalFormTypeEnum;
   zipCode?: string;
   turnover?: number;
-  siret?: string;
-  idNafCode?: number;
 }
 
 export interface ReferalProgram {
@@ -64,7 +61,6 @@ export interface RegisterProspect {
   idSource?: number;
   sourceAlias?: string;
   idTypeBrand: number;
-  permissions?: IPermission;
   analyticsUtm?: Omit<Partial<IAnalyticsUtm>, 'idSociety'>;
   comment?: string;
 }

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

@@ -1,20 +1,6 @@
-import { IsBoolean, IsEmail, IsOptional, IsPhoneNumber, IsString, ValidateNested } from 'class-validator';
+import { IsEmail, IsOptional, IsPhoneNumber, IsString } from 'class-validator';
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
-import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
 
-class RegisterReadablePermission {
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsBoolean()
-  @ToBoolean()
-  social?: boolean;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsBoolean()
-  @ToBoolean()
-  vat?: boolean;
-}
 export class RegisterWebhookBody {
   @ApiProperty()
   @IsEmail()
@@ -51,8 +37,4 @@ export class RegisterWebhookBody {
   @IsOptional()
   @IsString()
   nafCode?: string;
-
-  @ApiPropertyOptional()
-  @ValidateNested()
-  permissions?: RegisterReadablePermission;
 }

package/ts/types/Interface/models/IImmobilization.ts

@@ -12,7 +12,6 @@ export interface IImmobilization {
   quantitySelled?: number;
   amountOfSellTaxIncluded?: number | null;
   sellingDate?: Date | null;
-  trashingDate?: Date | null;
   acquisitionDate?: Date; // si il n'y a pas d'acquisition date, c'est un acompte
   duration: number;
   provider: string;

package/ts/types/Interface/models/IPayment.ts

@@ -25,7 +25,6 @@ export interface IPayment {
   isHiddenCustomer?: boolean;
   dateOverdue?: Date | null;
   datePayment: Date;
-  creditLossAt?: Date | null;
   comment?: string | null;
   internComment?: string | null;
   done?: boolean | null;

package/ts/types/Interface/models/IReport.ts

@@ -20,7 +20,6 @@ export interface IReport {
   idServiceConcerned?: number | null;
   idService?: number | null;
   idFile?: number | null;
-  fileLink?: string;
   idLetterType?: number | null;
   declareSoupcons?: boolean | null;
   token?: string | null;
@@ -32,10 +31,8 @@ export interface IReport {
   ressenti?: number | null;
   action?: number | null;
   processed?: boolean | null;
-  receivedAt?: Date | null;
   createdAt?: Date | null;
   updatedAt?: Date | null;
-  deletedAt?: Date | null;
 
   // Associations
   society?: ISociety;

package/ts/types/Interface/models/ISociety.ts

@@ -181,7 +181,7 @@ export interface ISociety {
   /** @deprecated */
   hidePartneredAccountantsBubbleLink?: boolean | null;
   cancelCompleteCreationModal?: Date | null;
-  isCreatedInApp?: number;
+  isCreatedInApp?: boolean;
   passwordIsuite?: string | null;
   unpaidState?: number | null;
 

package/ts/types/index.ts

@@ -325,8 +325,6 @@ export * from './Interface/models/IAIQuestion';
 export * from './Interface/models/IAIConversation';
 export * from './Interface/models/IPaymentAttempt';
 export * from './Interface/models/IDocumentRequest';
-export * from './Interface/models/IRevenueMovement';
-export * from './Interface/models/IRevenueSnapshot';
 
 // Schemas
 export * from './Interface/schemas/IRegistrationDetail';
@@ -559,7 +557,6 @@ export * from './Enum/TeamType';
 export * from './Enum/PartneredAccountantServiceType';
 export * from './Enum/PartneredAccountantServiceTypeId';
 export * from './Enum/PaymentAttempt';
-export * from './Enum/Revenue';
 
 // Interfaces API
 export * from './Interface/api/authentification/AuthenticationResponse';
@@ -882,6 +879,7 @@ 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';
 export * from './Interface/api/taxDeadline/QueryTaxDeadline';
@@ -1146,8 +1144,6 @@ export * from './Interface/api/recurrence/Query';
 export * from './Interface/api/recurrence/Read';
 export * from './Interface/api/documentRequest/Query';
 export * from './Interface/api/documentRequest/Create';
-export * from './Interface/api/automaticRegistration/Query';
-export * from './Interface/api/automaticRegistration/Read';
 
 // Enums types
 export * from './Interface/enum/Util';
@@ -1187,6 +1183,11 @@ export * from './Interface/api/regulation/Create';
 export * from './Interface/api/marketing/NewLeadSheet';
 export * from './Interface/api/ai/AskQuestionCollaborator';
 export * from './Interface/api/refund/QueryRefundPaginated';
-export * from './Interface/api/revenue/revenueMovement';
-export * from './Interface/api/revenue/revenueSnapshot';
-export * from './Interface/api/revenue/revenueSnapshotGenerate';
+
+// Revenue tracking interfaces
+export * from './Interface/models/IRevenueMovement';
+export * from './Interface/models/IRevenueSnapshot';
+export * from './Interface/api/revenueMovement';
+export * from './Interface/api/revenueSnapshot';
+export * from './Interface/api/revenueSnapshotGenerate';
+export * from './Enum/Revenue';

package/ts/utils/checkup.ts

@@ -287,6 +287,7 @@ export const getCheckupDetailForm = (
           text: 'Quels sont les modes de réglements dont vous disposez ?',
           value: 'collectionSystem',
           meta: {
+            multiple: true,
             items: [
               //TODO: ajouter PayPal et Stripe ?
               { text: 'Chèque', value: 'cheque' },

package/ts/utils/exercice.ts

@@ -1,16 +1,6 @@
 import { IExercice } from '../types';
 import * as dayjs from 'dayjs';
 
-/**
- * Check if the recovery date is before the exercice start date (with a 3 month tolerance)
- * @param recoveryDate - The recovery date from old expert info
- * @param exercice - The exercice to check
- * @returns true if the recovery date is before the exercice start date + 3 months
- */
-const isExerciceAfterRecoveryDate = (recoveryDate: Date, exercice: IExercice): boolean => {
-  return dayjs(recoveryDate).isBefore(dayjs(exercice.startDate).add(3, 'month'), 'day');
-};
-
 const exerciceNumber = (endDate: Date, exerciceList: IExercice[]): number => {
   let currentExercice: number = 0;
   exerciceList
@@ -31,4 +21,4 @@ const exerciceNumber = (endDate: Date, exerciceList: IExercice[]): number => {
   return currentExercice;
 };
 
-export { exerciceNumber, isExerciceAfterRecoveryDate };
+export { exerciceNumber };

package/ts/utils/prestation.ts

@@ -1,6 +1,5 @@
 import { IExercice, IPrestation, IPrestationList } from '../types';
 import { Vat } from '../types/Enum/Vat';
-import { ReasonTerminationType } from '../types/Enum/ReasonTerminationType';
 import { getTaxesIncludedAmount } from './vat/utils';
 import { intersection } from './noLodash';
 import {
@@ -167,8 +166,7 @@ const calculateScoringOfPrestation = (
     (prestation) =>
       prestation.paid &&
       prestation.signed &&
-      (prestation.terminationList === null ||
-        prestation.terminationList?.idReasonTermination?.includes(ReasonTerminationType.CHANGES_NEW_OFFERS)) &&
+      prestation.terminationList === null &&
       prestation.id !== currentIdPrestation,
   );