@movalib/movalib-commons 1.64.2 → 1.64.4

package/src/models/User.ts

@@ -1,104 +1,104 @@
 import { Gender, RoleType } from "../helpers/Enums";
-import Address from './Address';
+import Address from "./Address";
 import Garage from "./Garage";
 import Role from "./Role";
 import Vehicle from "./Vehicle";
 
 export default class User {
-
-    // Properties
-    id: string;
-    roles: Role[];
-    firstname: string;
-    lastname: string;
-    avatar: string;
-    password: string;
-    created: Date;
-    email?: string;
-    gender?: Gender;
-    birthDate?: Date;
-    addresses? : Address[] 
-    phoneNumber?: string;
-    vehicles?: Vehicle[];
-    isActive?: Boolean;
-    hasPassword?: Boolean;
-    garages?: Garage[];
-
-    constructor(
-        id: string,
-        roles: Role[],
-        firstname: string = '',
-        lastname: string = '',
-        avatar: string = '',
-        password: string = '',
-        created: Date = new Date(),
-        email?: string,
-        gender?: Gender,
-        birthDate?: Date,
-        addresses?: Address[],
-        phoneNumber?: string ,
-        vehicles?: Vehicle[],
-        isActive?: Boolean,
-        hasPassword?: Boolean,
-        garages?: Garage[]
-    ) {
-        this.id = id;
-        this.roles = roles;
-        this.firstname = firstname;
-        this.lastname = lastname;
-        this.avatar = avatar;
-        this.email = email;
-        this.password = password;
-        this.created = created;
-        this.gender = gender;
-        this.birthDate = birthDate;
-        this.addresses = addresses;
-        this.phoneNumber = phoneNumber;
-        this.vehicles = vehicles;
-        this.isActive = isActive;
-        this.hasPassword = hasPassword;
-        this.garages = garages;
-    }
-
-    static getFirstLetter = (user: User) : string => {
-
-        const firstLetter = user.lastname[0].toUpperCase();
-        return /[0-9]/.test(firstLetter) ? '0-9' : firstLetter;
-    }
-
-    static isGarageCustomer = (user: User) : boolean => {
-        if(!user || !user.roles) return false;
-
-        return Boolean(user.roles.find(r => r.name === RoleType.GARAGE_CUSTOMER));
-    }
-
-    static isGarageTechnician = (user: User) : boolean => {
-        if(!user || !user.roles) return false;
-
-        return Boolean(user.roles.find(r => r.name === RoleType.GARAGE_TECHNICIAN));
-    }
-
-    static isGarageAdmin = (user: User) : boolean => {
-        if(!user || !user.roles) return false;
-
-        return Boolean(user.roles.find(r => r.name === RoleType.GARAGE_ADMIN));
-    }
-
-    static isSales = (user: User) : boolean => {
-        if(!user || !user.roles) return false;
-
-        return Boolean(user.roles.find(r => r.name === RoleType.SALES));
-    }
-
-    static isCsM = (user: User) : boolean => {
-        if(!user || !user.roles) return false;
-
-        return Boolean(user.roles.find(r => r.name === RoleType.CSM));
-    }
-
-    static isSuperAdmin = (user: User) : boolean => {
-        if(!user || !user.roles) return false;
-
-        return Boolean(user.roles.find(r => r.name === RoleType.SUPER_ADMIN));
-    }
-}
+  // Properties
+  id: string;
+  roles: Role[];
+  firstname: string;
+  lastname: string;
+  avatar: string;
+  password: string;
+  created: Date;
+  billingAddress?: Address;
+  email?: string;
+  gender?: Gender;
+  birthDate?: Date;
+  phoneNumber?: string;
+  vehicles?: Vehicle[];
+  isActive?: Boolean;
+  hasPassword?: Boolean;
+  garages?: Garage[];
+
+  constructor(
+    id: string,
+    roles: Role[],
+    firstname: string = "",
+    lastname: string = "",
+    avatar: string = "",
+    password: string = "",
+    created: Date = new Date(),
+    billingAddress?: Address,
+    email?: string,
+    gender?: Gender,
+    birthDate?: Date,
+    phoneNumber?: string,
+    vehicles?: Vehicle[],
+    isActive?: Boolean,
+    hasPassword?: Boolean,
+    garages?: Garage[]
+  ) {
+    this.id = id;
+    this.roles = roles;
+    this.firstname = firstname;
+    this.lastname = lastname;
+    this.avatar = avatar;
+    this.email = email;
+    this.password = password;
+    this.created = created;
+    this.gender = gender;
+    this.birthDate = birthDate;
+    this.billingAddress = billingAddress;
+    this.phoneNumber = phoneNumber;
+    this.vehicles = vehicles;
+    this.isActive = isActive;
+    this.hasPassword = hasPassword;
+    this.garages = garages;
+  }
+
+  static getFirstLetter = (user: User): string => {
+    const firstLetter = user.lastname[0].toUpperCase();
+    return /[0-9]/.test(firstLetter) ? "0-9" : firstLetter;
+  };
+
+  static isGarageCustomer = (user: User): boolean => {
+    if (!user || !user.roles) return false;
+
+    return Boolean(user.roles.find((r) => r.name === RoleType.GARAGE_CUSTOMER));
+  };
+
+  static isGarageTechnician = (user: User): boolean => {
+    if (!user || !user.roles) return false;
+
+    return Boolean(
+      user.roles.find((r) => r.name === RoleType.GARAGE_TECHNICIAN)
+    );
+  };
+
+  static isGarageAdmin = (user: User): boolean => {
+    if (!user || !user.roles) return false;
+
+    return Boolean(user.roles.find((r) => r.name === RoleType.GARAGE_ADMIN));
+  };
+
+  static isSales = (user: User): boolean => {
+    if (!user || !user.roles) return false;
+
+    return Boolean(user.roles.find((r) => r.name === RoleType.SALES));
+  };
+
+  static isCsM = (user: User): boolean => {
+    if (!user || !user.roles) return false;
+
+    return Boolean(user.roles.find((r) => r.name === RoleType.CSM));
+  };
+
+  static isSuperAdmin = (user: User): boolean => {
+    if (!user || !user.roles) return false;
+
+    return Boolean(user.roles.find((r) => r.name === RoleType.SUPER_ADMIN));
+  };
+}

package/src/models/Vehicle.ts

@@ -38,6 +38,11 @@ export default class Vehicle {
   foreignPlate: boolean;
   tireBrand?: string;
   tireProfile?: string;
+  secondaryTireDiameter: string;
+  secondaryTireHeight: string;
+  secondaryTireSpeedIndex: string;
+  secondaryTireWidth: string;
+  secondaryTireSize: VehicleTire;
 
   constructor(
     id: number,
@@ -61,6 +66,11 @@ export default class Vehicle {
     lastInspectionDate: Date,
     lastMaintenanceDate: Date,
     foreignPlate: boolean,
+    secondaryTireDiameter: string,
+    secondaryTireHeight: string,
+    secondaryTireSpeedIndex: string,
+    secondaryTireWidth: string,
+    secondaryTireSize: VehicleTire,
     tireBrand?: string,
     tireProfile?: string
   ) {
@@ -87,6 +97,11 @@ export default class Vehicle {
     this.foreignPlate = foreignPlate;
     this.tireBrand = tireBrand;
     this.tireProfile = tireProfile;
+    this.secondaryTireDiameter = secondaryTireDiameter;
+    this.secondaryTireHeight = secondaryTireHeight;
+    this.secondaryTireSpeedIndex = secondaryTireSpeedIndex;
+    this.secondaryTireWidth = secondaryTireWidth;
+    this.secondaryTireSize = secondaryTireSize;
   }
 
   getVehicleLabel() {

package/src/services/GarageService.types.ts

@@ -1,32 +1,36 @@
 export type AddCustomerVehicleParams = {
-	/** L'identifiant unique du garage */
-	garageId: string;
-	/** L'identifiant unique du client */
-	customerId: string;
-	/** La plaque d'immat du véhicule */
-	plate: string;
-	/** Le nombre de km au compteur */
-	currentMileage?: number;
-	/** Le nombre moyen de km par an */
-	averageMileagePerYear?: number;
+  /** L'identifiant unique du garage */
+  garageId: string;
+  /** L'identifiant unique du client */
+  customerId: string;
+  /** La plaque d'immat du véhicule */
+  plate: string;
+  /** Le nombre de km au compteur */
+  currentMileage?: number;
+  /** Le nombre moyen de km par an */
+  averageMileagePerYear?: number;
 
-	/** Identification du pneu (XXX XX RXX XXX) */
-	tireWidth?: string;
-	tireHeight?: string;
-	tireDiameter?: string;
-	tireSpeedIndex?: string;
-	lastMaintenanceDate?: string;
-	lastInspectionDate?: string;
-	isForeignPlate?: boolean;
-	model?: string
-}
+  /** Identification du pneu (XXX XX RXX XXX) */
+  tireWidth?: string;
+  tireHeight?: string;
+  tireDiameter?: string;
+  tireSpeedIndex?: string;
+  secondaryTireWidth?: string;
+  secondaryTireHeight?: string;
+  secondaryTireDiameter?: string;
+  secondaryTireSpeedIndex?: string;
+  lastMaintenanceDate?: string;
+  lastInspectionDate?: string;
 
+  isForeignPlate?: boolean;
+  model?: string;
+};
 
 export type DeleteCustomerVehicleParams = {
-	/** L'identifiant unique du garage */
-	garageId: string;
-	/** L'identifiant unique du client */
-	customerId: string;
-	/** L'identifiant unique du véhicule */
-	vehicleId: string;
-}
+  /** L'identifiant unique du garage */
+  garageId: string;
+  /** L'identifiant unique du client */
+  customerId: string;
+  /** L'identifiant unique du véhicule */
+  vehicleId: string;
+};