@metarisc/metarisc-js 0.0.1-alpha.25 → 0.0.1-alpha.27

package/lib/api/PEIAPI.d.ts

@@ -4,7 +4,7 @@ import { Client } from "../client";
 import { Collection } from "../collection";
 import { PEI } from '../model/PEI';
 import { Contact } from '../model/Contact';
-import { DescriptifTechnique } from '../model/DescriptifTechnique';
+import { DescriptifTechniqueDECI } from '../model/DescriptifTechniqueDECI';
 import { PieceJointe } from '../model/PieceJointe';
 export declare class PEIAPI extends Core {
     constructor(config: MetariscConfig, client?: Client);
@@ -32,7 +32,7 @@ export declare class PEIAPI extends Core {
      * @param page Numéro de page
      * @param perPage Nombre de résultats demandé
      */
-    paginatePeiHistorique(peiId: string, page?: number, perPage?: number): Collection<DescriptifTechnique>;
+    paginatePeiHistorique(peiId: string, page?: number, perPage?: number): Collection<DescriptifTechniqueDECI>;
     /**
      * Récupération de la liste des pièces jointes d'un Point d'Eau Incendie.
      * @param peiId Identifiant unique du PEI

package/lib/client.d.ts

@@ -1,5 +1,6 @@
 import { AxiosResponse } from "axios";
 import { MetariscConfig, OAuth2Options } from "./core";
+import { GrantResponse } from "./auth/oauth2";
 interface RequestConfig {
     body?: any;
     headers?: {
@@ -21,7 +22,7 @@ export declare class Client {
     private access_token?;
     private refresh_token?;
     constructor(config: MetariscConfig);
-    authenticate(auth_method: AuthMethod, options: OAuth2Options): Promise<void>;
+    authenticate(auth_method: AuthMethod, options: OAuth2Options): Promise<GrantResponse>;
     /**
      * Lance une requête (authentifiée si possible) sur l'API Metarisc.
      */

package/lib/client.js

@@ -68,10 +68,12 @@ class Client {
             const response = await this.oauth2.getAuthorizationCode(options);
             this.setAccessToken(response.token_type + " " + response.access_token);
             this.setRefreshToken(response.refresh_token);
+            return response;
         }
         else if (auth_method === AuthMethod.CLIENT_CREDENTIALS) {
             const response = await this.oauth2.getClientCredentials(options);
             this.setAccessToken(response.token_type + " " + response.access_token);
+            return response;
         }
         else {
             throw new Error("auth_method inconnue");

package/lib/core.d.ts

@@ -1,6 +1,7 @@
 import { AxiosResponse } from "axios";
 import { AuthMethod, Client } from "./client";
 import { Collection } from "./collection";
+import { GrantResponse } from "./auth/oauth2";
 interface RequestConfig {
     body?: any;
     headers?: {
@@ -31,7 +32,7 @@ export declare class Core {
     constructor(config: MetariscConfig, client?: Client);
     request<T>(config: RequestConfig): Promise<AxiosResponse<T>>;
     collect<T>(config: RequestConfig): Collection<T>;
-    authenticate(auth_method: AuthMethod, options: OAuth2Options): Promise<void>;
+    authenticate(auth_method: AuthMethod, options: OAuth2Options): Promise<GrantResponse>;
     setAccessToken(access_token: string): void;
     setRefreshToken(refresh_token: string): void;
 }

package/lib/core.js

@@ -19,7 +19,7 @@ class Core {
         });
     }
     async authenticate(auth_method, options) {
-        await this.client.authenticate(auth_method, options);
+        return await this.client.authenticate(auth_method, options);
     }
     setAccessToken(access_token) {
         this.client.setAccessToken(access_token);

package/lib/model/AnomaliePEI.d.ts

@@ -0,0 +1,8 @@
+import { AnomalieDECI } from '../../src/model/AnomalieDECI';
+export type AnomaliePEI = {
+    'anomalie'?: AnomalieDECI;
+    'date_debut'?: Date;
+    'date_fin'?: Date;
+    'est_programmee'?: boolean;
+    'date_pose'?: Date;
+};

package/lib/model/{DescriptifTechnique.d.ts → DescriptifTechniqueDECI.d.ts}

@@ -1,11 +1,23 @@
 import { DescriptifTechniquePENA } from '../../src/model/DescriptifTechniquePENA';
 import { DescriptifTechniquePIBI } from '../../src/model/DescriptifTechniquePIBI';
-export type DescriptifTechnique = DescriptifTechniquePIBI | DescriptifTechniquePENA;
+export type DescriptifTechniqueDECI = DescriptifTechniquePIBI | DescriptifTechniquePENA;
+export declare enum TypeEnum {
+    Pibi = "PIBI",
+    Pena = "PENA"
+}
 export declare enum DomanialiteEnum {
     Privee = "privee",
     Publique = "publique",
     PriveeConventionnee = "privee_conventionnee"
 }
+export declare enum StatutEnum {
+    RepriseDeDonnees = "reprise_de_donnees",
+    DeclarationEnCours = "declaration_en_cours",
+    ReconnaissanceOperationnelleInitiale = "reconnaissance_operationnelle_initiale",
+    Actif = "actif",
+    Projet = "projet",
+    Reforme = "reforme"
+}
 export declare enum NatureEnum {
     PointAspiration = "POINT_ASPIRATION",
     CiterneAerienne = "CITERNE_AERIENNE",
@@ -20,21 +32,3 @@ export declare enum NatureEnum {
     PoteauAspiration2x100 = "POTEAU_ASPIRATION_2x100",
     BoucheAspiration1x100 = "BOUCHE_ASPIRATION_1x100"
 }
-export declare enum CaracteristiquesParticulieresEnum {
-    Renversable = "RENVERSABLE",
-    PreMelange = "PRE_MELANGE"
-}
-export declare enum EssaisEnginUtiliseEnum {
-    Aucun = "AUCUN",
-    Fpt = "FPT",
-    Mpr = "MPR",
-    Ccf = "CCF"
-}
-export declare enum EquipementsEnum {
-    Guichet = "GUICHET",
-    CanneAspiration = "CANNE_ASPIRATION",
-    Puit = "PUIT",
-    TrouHomme = "TROU_HOMME",
-    RaccordTournant = "RACCORD_TOURNANT",
-    PriseDirecte = "PRISE_DIRECTE"
-}

package/lib/model/DescriptifTechniqueDECI.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NatureEnum = exports.StatutEnum = exports.DomanialiteEnum = exports.TypeEnum = void 0;
+var TypeEnum;
+(function (TypeEnum) {
+    TypeEnum["Pibi"] = "PIBI";
+    TypeEnum["Pena"] = "PENA";
+})(TypeEnum = exports.TypeEnum || (exports.TypeEnum = {}));
+var DomanialiteEnum;
+(function (DomanialiteEnum) {
+    DomanialiteEnum["Privee"] = "privee";
+    DomanialiteEnum["Publique"] = "publique";
+    DomanialiteEnum["PriveeConventionnee"] = "privee_conventionnee";
+})(DomanialiteEnum = exports.DomanialiteEnum || (exports.DomanialiteEnum = {}));
+var StatutEnum;
+(function (StatutEnum) {
+    StatutEnum["RepriseDeDonnees"] = "reprise_de_donnees";
+    StatutEnum["DeclarationEnCours"] = "declaration_en_cours";
+    StatutEnum["ReconnaissanceOperationnelleInitiale"] = "reconnaissance_operationnelle_initiale";
+    StatutEnum["Actif"] = "actif";
+    StatutEnum["Projet"] = "projet";
+    StatutEnum["Reforme"] = "reforme";
+})(StatutEnum = exports.StatutEnum || (exports.StatutEnum = {}));
+var NatureEnum;
+(function (NatureEnum) {
+    NatureEnum["PointAspiration"] = "POINT_ASPIRATION";
+    NatureEnum["CiterneAerienne"] = "CITERNE_AERIENNE";
+    NatureEnum["CiterneEnterree"] = "CITERNE_ENTERREE";
+    NatureEnum["CiterneSemiEnterree"] = "CITERNE_SEMI_ENTERREE";
+    NatureEnum["CiterneSouple"] = "CITERNE_SOUPLE";
+    NatureEnum["ReserveAerienne"] = "RESERVE_AERIENNE";
+    NatureEnum["PoteauRelais"] = "POTEAU_RELAIS";
+    NatureEnum["PuisardAspiration"] = "PUISARD_ASPIRATION";
+    NatureEnum["PriseDeportee"] = "PRISE_DEPORTEE";
+    NatureEnum["PoteauAspiration1x100"] = "POTEAU_ASPIRATION_1x100";
+    NatureEnum["PoteauAspiration2x100"] = "POTEAU_ASPIRATION_2x100";
+    NatureEnum["BoucheAspiration1x100"] = "BOUCHE_ASPIRATION_1x100";
+})(NatureEnum = exports.NatureEnum || (exports.NatureEnum = {}));

package/lib/model/DescriptifTechniqueDECIBase.d.ts

@@ -1,16 +1,32 @@
-import { AnomalieDECI } from '../../src/model/AnomalieDECI';
-import { DescriptifTechniqueBase } from '../model/DescriptifTechniqueBase';
-export type DescriptifTechniqueDECIBase = DescriptifTechniqueBase & {
-    'anomalies'?: Array<AnomalieDECI>;
+import { AnomaliePEI } from '../../src/model/AnomaliePEI';
+export type DescriptifTechniqueDECIBase = {
+    'id'?: string;
+    'type'?: TypeEnum;
+    'anomalies'?: Array<AnomaliePEI>;
     'est_reglementaire'?: boolean;
-    'est_reforme'?: boolean;
     'domanialite'?: DomanialiteEnum;
-    'est_conforme'?: boolean;
+    'est_conforme_rddeci'?: boolean;
     'performance_theorique'?: number;
     'performance_reelle'?: number;
+    'observations_generales'?: string;
+    'date'?: Date;
+    'statut'?: StatutEnum;
+    'est_disponible'?: boolean;
 };
+export declare enum TypeEnum {
+    Pibi = "PIBI",
+    Pena = "PENA"
+}
 export declare enum DomanialiteEnum {
     Privee = "privee",
     Publique = "publique",
     PriveeConventionnee = "privee_conventionnee"
 }
+export declare enum StatutEnum {
+    RepriseDeDonnees = "reprise_de_donnees",
+    DeclarationEnCours = "declaration_en_cours",
+    ReconnaissanceOperationnelleInitiale = "reconnaissance_operationnelle_initiale",
+    Actif = "actif",
+    Projet = "projet",
+    Reforme = "reforme"
+}

package/lib/model/DescriptifTechniqueDECIBase.js

@@ -1,9 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DomanialiteEnum = void 0;
+exports.StatutEnum = exports.DomanialiteEnum = exports.TypeEnum = void 0;
+var TypeEnum;
+(function (TypeEnum) {
+    TypeEnum["Pibi"] = "PIBI";
+    TypeEnum["Pena"] = "PENA";
+})(TypeEnum = exports.TypeEnum || (exports.TypeEnum = {}));
 var DomanialiteEnum;
 (function (DomanialiteEnum) {
     DomanialiteEnum["Privee"] = "privee";
     DomanialiteEnum["Publique"] = "publique";
     DomanialiteEnum["PriveeConventionnee"] = "privee_conventionnee";
 })(DomanialiteEnum = exports.DomanialiteEnum || (exports.DomanialiteEnum = {}));
+var StatutEnum;
+(function (StatutEnum) {
+    StatutEnum["RepriseDeDonnees"] = "reprise_de_donnees";
+    StatutEnum["DeclarationEnCours"] = "declaration_en_cours";
+    StatutEnum["ReconnaissanceOperationnelleInitiale"] = "reconnaissance_operationnelle_initiale";
+    StatutEnum["Actif"] = "actif";
+    StatutEnum["Projet"] = "projet";
+    StatutEnum["Reforme"] = "reforme";
+})(StatutEnum = exports.StatutEnum || (exports.StatutEnum = {}));

package/lib/model/DescriptifTechniquePENA.d.ts

@@ -1,31 +1,24 @@
-import { DescriptifTechniquePENAAllOfRealimentation } from '../../src/model/DescriptifTechniquePENAAllOfRealimentation';
-import { DescriptifTechniquePENAAllOfVolumes } from '../../src/model/DescriptifTechniquePENAAllOfVolumes';
 import { DescriptifTechniqueDECIBase } from '../model/DescriptifTechniqueDECIBase';
 export type DescriptifTechniquePENA = DescriptifTechniqueDECIBase & {
-    'essais_engin_utilise'?: EssaisEnginUtiliseEnum;
-    'equipements'?: EquipementsEnum;
     'nature'?: NatureEnum;
-    'volumes'?: DescriptifTechniquePENAAllOfVolumes;
-    'realimentation'?: Array<DescriptifTechniquePENAAllOfRealimentation>;
+    'volume'?: number;
 };
+export declare enum TypeEnum {
+    Pibi = "PIBI",
+    Pena = "PENA"
+}
 export declare enum DomanialiteEnum {
     Privee = "privee",
     Publique = "publique",
     PriveeConventionnee = "privee_conventionnee"
 }
-export declare enum EssaisEnginUtiliseEnum {
-    Aucun = "AUCUN",
-    Fpt = "FPT",
-    Mpr = "MPR",
-    Ccf = "CCF"
-}
-export declare enum EquipementsEnum {
-    Guichet = "GUICHET",
-    CanneAspiration = "CANNE_ASPIRATION",
-    Puit = "PUIT",
-    TrouHomme = "TROU_HOMME",
-    RaccordTournant = "RACCORD_TOURNANT",
-    PriseDirecte = "PRISE_DIRECTE"
+export declare enum StatutEnum {
+    RepriseDeDonnees = "reprise_de_donnees",
+    DeclarationEnCours = "declaration_en_cours",
+    ReconnaissanceOperationnelleInitiale = "reconnaissance_operationnelle_initiale",
+    Actif = "actif",
+    Projet = "projet",
+    Reforme = "reforme"
 }
 export declare enum NatureEnum {
     PointAspiration = "POINT_ASPIRATION",

package/lib/model/DescriptifTechniquePENA.js

@@ -1,28 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NatureEnum = exports.EquipementsEnum = exports.EssaisEnginUtiliseEnum = exports.DomanialiteEnum = void 0;
+exports.NatureEnum = exports.StatutEnum = exports.DomanialiteEnum = exports.TypeEnum = void 0;
+var TypeEnum;
+(function (TypeEnum) {
+    TypeEnum["Pibi"] = "PIBI";
+    TypeEnum["Pena"] = "PENA";
+})(TypeEnum = exports.TypeEnum || (exports.TypeEnum = {}));
 var DomanialiteEnum;
 (function (DomanialiteEnum) {
     DomanialiteEnum["Privee"] = "privee";
     DomanialiteEnum["Publique"] = "publique";
     DomanialiteEnum["PriveeConventionnee"] = "privee_conventionnee";
 })(DomanialiteEnum = exports.DomanialiteEnum || (exports.DomanialiteEnum = {}));
-var EssaisEnginUtiliseEnum;
-(function (EssaisEnginUtiliseEnum) {
-    EssaisEnginUtiliseEnum["Aucun"] = "AUCUN";
-    EssaisEnginUtiliseEnum["Fpt"] = "FPT";
-    EssaisEnginUtiliseEnum["Mpr"] = "MPR";
-    EssaisEnginUtiliseEnum["Ccf"] = "CCF";
-})(EssaisEnginUtiliseEnum = exports.EssaisEnginUtiliseEnum || (exports.EssaisEnginUtiliseEnum = {}));
-var EquipementsEnum;
-(function (EquipementsEnum) {
-    EquipementsEnum["Guichet"] = "GUICHET";
-    EquipementsEnum["CanneAspiration"] = "CANNE_ASPIRATION";
-    EquipementsEnum["Puit"] = "PUIT";
-    EquipementsEnum["TrouHomme"] = "TROU_HOMME";
-    EquipementsEnum["RaccordTournant"] = "RACCORD_TOURNANT";
-    EquipementsEnum["PriseDirecte"] = "PRISE_DIRECTE";
-})(EquipementsEnum = exports.EquipementsEnum || (exports.EquipementsEnum = {}));
+var StatutEnum;
+(function (StatutEnum) {
+    StatutEnum["RepriseDeDonnees"] = "reprise_de_donnees";
+    StatutEnum["DeclarationEnCours"] = "declaration_en_cours";
+    StatutEnum["ReconnaissanceOperationnelleInitiale"] = "reconnaissance_operationnelle_initiale";
+    StatutEnum["Actif"] = "actif";
+    StatutEnum["Projet"] = "projet";
+    StatutEnum["Reforme"] = "reforme";
+})(StatutEnum = exports.StatutEnum || (exports.StatutEnum = {}));
 var NatureEnum;
 (function (NatureEnum) {
     NatureEnum["PointAspiration"] = "POINT_ASPIRATION";

package/lib/model/DescriptifTechniquePIBI.d.ts

@@ -1,4 +1,3 @@
-import { DescriptifTechniquePIBIAllOfPesees } from '../../src/model/DescriptifTechniquePIBIAllOfPesees';
 import { DescriptifTechniqueDECIBase } from '../model/DescriptifTechniqueDECIBase';
 export type DescriptifTechniquePIBI = DescriptifTechniqueDECIBase & {
     'numero_serie_appareil'?: string;
@@ -7,14 +6,28 @@ export type DescriptifTechniquePIBI = DescriptifTechniqueDECIBase & {
     */
     'surpression'?: number;
     'nature'?: NatureEnum;
-    'caracteristiques_particulieres'?: CaracteristiquesParticulieresEnum;
-    'pesees'?: DescriptifTechniquePIBIAllOfPesees;
+    'debit_1bar'?: number;
+    'pression'?: number;
+    'pression_statique'?: number;
+    'debit_gueule_bee'?: number;
 };
+export declare enum TypeEnum {
+    Pibi = "PIBI",
+    Pena = "PENA"
+}
 export declare enum DomanialiteEnum {
     Privee = "privee",
     Publique = "publique",
     PriveeConventionnee = "privee_conventionnee"
 }
+export declare enum StatutEnum {
+    RepriseDeDonnees = "reprise_de_donnees",
+    DeclarationEnCours = "declaration_en_cours",
+    ReconnaissanceOperationnelleInitiale = "reconnaissance_operationnelle_initiale",
+    Actif = "actif",
+    Projet = "projet",
+    Reforme = "reforme"
+}
 export declare enum NatureEnum {
     Pi1x65 = "PI1x65",
     Pi1x65Pi2x45 = "PI1x65+PI2x45",
@@ -25,7 +38,3 @@ export declare enum NatureEnum {
     Bi1x100 = "BI1x100",
     Bi2x100 = "BI2x100"
 }
-export declare enum CaracteristiquesParticulieresEnum {
-    Renversable = "RENVERSABLE",
-    PreMelange = "PRE_MELANGE"
-}

package/lib/model/DescriptifTechniquePIBI.js

@@ -1,12 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CaracteristiquesParticulieresEnum = exports.NatureEnum = exports.DomanialiteEnum = void 0;
+exports.NatureEnum = exports.StatutEnum = exports.DomanialiteEnum = exports.TypeEnum = void 0;
+var TypeEnum;
+(function (TypeEnum) {
+    TypeEnum["Pibi"] = "PIBI";
+    TypeEnum["Pena"] = "PENA";
+})(TypeEnum = exports.TypeEnum || (exports.TypeEnum = {}));
 var DomanialiteEnum;
 (function (DomanialiteEnum) {
     DomanialiteEnum["Privee"] = "privee";
     DomanialiteEnum["Publique"] = "publique";
     DomanialiteEnum["PriveeConventionnee"] = "privee_conventionnee";
 })(DomanialiteEnum = exports.DomanialiteEnum || (exports.DomanialiteEnum = {}));
+var StatutEnum;
+(function (StatutEnum) {
+    StatutEnum["RepriseDeDonnees"] = "reprise_de_donnees";
+    StatutEnum["DeclarationEnCours"] = "declaration_en_cours";
+    StatutEnum["ReconnaissanceOperationnelleInitiale"] = "reconnaissance_operationnelle_initiale";
+    StatutEnum["Actif"] = "actif";
+    StatutEnum["Projet"] = "projet";
+    StatutEnum["Reforme"] = "reforme";
+})(StatutEnum = exports.StatutEnum || (exports.StatutEnum = {}));
 var NatureEnum;
 (function (NatureEnum) {
     NatureEnum["Pi1x65"] = "PI1x65";
@@ -18,8 +32,3 @@ var NatureEnum;
     NatureEnum["Bi1x100"] = "BI1x100";
     NatureEnum["Bi2x100"] = "BI2x100";
 })(NatureEnum = exports.NatureEnum || (exports.NatureEnum = {}));
-var CaracteristiquesParticulieresEnum;
-(function (CaracteristiquesParticulieresEnum) {
-    CaracteristiquesParticulieresEnum["Renversable"] = "RENVERSABLE";
-    CaracteristiquesParticulieresEnum["PreMelange"] = "PRE_MELANGE";
-})(CaracteristiquesParticulieresEnum = exports.CaracteristiquesParticulieresEnum || (exports.CaracteristiquesParticulieresEnum = {}));

package/lib/model/PEI.d.ts

@@ -1,13 +1,36 @@
 import { AdressePostale } from '../../src/model/AdressePostale';
-import { DescriptifTechnique } from '../../src/model/DescriptifTechnique';
+import { DescriptifTechniqueDECIBase } from '../../src/model/DescriptifTechniqueDECIBase';
 import { PEIReferencesExterieuresInner } from '../../src/model/PEIReferencesExterieuresInner';
 export type PEI = {
     'id'?: string;
     'date_de_realisation'?: Date;
     'date_de_derniere_mise_a_jour'?: Date;
-    'statut'?: string;
     'references_exterieures'?: Array<PEIReferencesExterieuresInner>;
-    'descriptif_technique'?: DescriptifTechnique;
-    'geometrie'?: string;
-    'adresse_postale'?: AdressePostale;
+    'descriptif_technique'?: DescriptifTechniqueDECIBase;
+    'implantation'?: AdressePostale;
+    'genre'?: GenreEnum;
+    'numero'?: string;
+    'numero_compteur'?: string;
 };
+export declare enum GenreEnum {
+    Pi1x65 = "PI1x65",
+    Pi1x65Pi2x45 = "PI1x65+PI2x45",
+    Pi1x100 = "PI1x100",
+    Pi2x100 = "PI2x100",
+    Bi1x65 = "BI1x65",
+    Bi1x80 = "BI1x80",
+    Bi1x100 = "BI1x100",
+    Bi2x100 = "BI2x100",
+    PointAspiration = "POINT_ASPIRATION",
+    CiterneAerienne = "CITERNE_AERIENNE",
+    CiterneEnterree = "CITERNE_ENTERREE",
+    CiterneSemiEnterree = "CITERNE_SEMI_ENTERREE",
+    CiterneSouple = "CITERNE_SOUPLE",
+    ReserveAerienne = "RESERVE_AERIENNE",
+    PoteauRelais = "POTEAU_RELAIS",
+    PuisardAspiration = "PUISARD_ASPIRATION",
+    PriseDeportee = "PRISE_DEPORTEE",
+    PoteauAspiration1x100 = "POTEAU_ASPIRATION_1x100",
+    PoteauAspiration2x100 = "POTEAU_ASPIRATION_2x100",
+    BoucheAspiration1x100 = "BOUCHE_ASPIRATION_1x100"
+}

package/lib/model/PEI.js

@@ -1,2 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.GenreEnum = void 0;
+var GenreEnum;
+(function (GenreEnum) {
+    GenreEnum["Pi1x65"] = "PI1x65";
+    GenreEnum["Pi1x65Pi2x45"] = "PI1x65+PI2x45";
+    GenreEnum["Pi1x100"] = "PI1x100";
+    GenreEnum["Pi2x100"] = "PI2x100";
+    GenreEnum["Bi1x65"] = "BI1x65";
+    GenreEnum["Bi1x80"] = "BI1x80";
+    GenreEnum["Bi1x100"] = "BI1x100";
+    GenreEnum["Bi2x100"] = "BI2x100";
+    GenreEnum["PointAspiration"] = "POINT_ASPIRATION";
+    GenreEnum["CiterneAerienne"] = "CITERNE_AERIENNE";
+    GenreEnum["CiterneEnterree"] = "CITERNE_ENTERREE";
+    GenreEnum["CiterneSemiEnterree"] = "CITERNE_SEMI_ENTERREE";
+    GenreEnum["CiterneSouple"] = "CITERNE_SOUPLE";
+    GenreEnum["ReserveAerienne"] = "RESERVE_AERIENNE";
+    GenreEnum["PoteauRelais"] = "POTEAU_RELAIS";
+    GenreEnum["PuisardAspiration"] = "PUISARD_ASPIRATION";
+    GenreEnum["PriseDeportee"] = "PRISE_DEPORTEE";
+    GenreEnum["PoteauAspiration1x100"] = "POTEAU_ASPIRATION_1x100";
+    GenreEnum["PoteauAspiration2x100"] = "POTEAU_ASPIRATION_2x100";
+    GenreEnum["BoucheAspiration1x100"] = "BOUCHE_ASPIRATION_1x100";
+})(GenreEnum = exports.GenreEnum || (exports.GenreEnum = {}));

package/package.json

@@ -2,7 +2,7 @@
   "name": "@metarisc/metarisc-js",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
-  "version": "0.0.1-alpha.25",
+  "version": "0.0.1-alpha.27",
   "scripts": {
     "lint": "eslint . --ext .ts --fix",
     "compile": "tsc",

package/src/api/PEIAPI.ts

@@ -5,7 +5,7 @@ import { Client } from "../client";
 import { Collection } from "../collection";
 import { PEI } from '../model/PEI';
 import { Contact } from '../model/Contact';
-import { DescriptifTechnique } from '../model/DescriptifTechnique';
+import { DescriptifTechniqueDECI } from '../model/DescriptifTechniqueDECI';
 import { PieceJointe } from '../model/PieceJointe';
 
 export class PEIAPI extends Core {
@@ -70,10 +70,10 @@ export class PEIAPI extends Core {
      * @param page Numéro de page
      * @param perPage Nombre de résultats demandé
      */
-    paginatePeiHistorique(peiId: string, page?: number, perPage?: number): Collection<DescriptifTechnique>
+    paginatePeiHistorique(peiId: string, page?: number, perPage?: number): Collection<DescriptifTechniqueDECI>
     {
         const pathVariable = { 'pei_id': peiId };
-        return this.collect<DescriptifTechnique>({
+        return this.collect<DescriptifTechniqueDECI>({
             method: 'GET',
             endpoint: Utils.constructPath(pathVariable, '/pei/{pei_id}/historique'),
             headers: {  },

package/src/client.ts

@@ -5,7 +5,7 @@ import axios, {
 } from "axios";
 import axiosRetry from "axios-retry";
 import { MetariscConfig, OAuth2Options } from "./core";
-import { OAuth2 } from "./auth/oauth2";
+import { GrantResponse, OAuth2 } from "./auth/oauth2";
 import { setupCache } from "axios-cache-interceptor";
 import Utils from "./utils";
 
@@ -87,15 +87,17 @@ export class Client {
 	async authenticate(
 		auth_method: AuthMethod,
 		options: OAuth2Options
-	): Promise<void> {
+	): Promise<GrantResponse> {
 		if(auth_method === AuthMethod.AUTHORIZATION_CODE) {
 			const response = await this.oauth2.getAuthorizationCode(options);
 			this.setAccessToken(response.token_type + " " + response.access_token);
 			this.setRefreshToken(response.refresh_token);
+			return response;
 		}
 		else if(auth_method === AuthMethod.CLIENT_CREDENTIALS) {
 			const response = await this.oauth2.getClientCredentials(options);
 			this.setAccessToken(response.token_type + " " + response.access_token);
+			return response;
 		}
 		else {
 			throw new Error("auth_method inconnue");		

package/src/core.ts

@@ -1,6 +1,7 @@
 import { AxiosResponse } from "axios";
 import { AuthMethod, Client } from "./client";
 import { Collection } from "./collection";
+import { GrantResponse } from "./auth/oauth2";
 
 interface RequestConfig {
     body?: any;
@@ -49,8 +50,8 @@ export class Core {
     async authenticate(
         auth_method: AuthMethod,
         options: OAuth2Options
-    ): Promise<void> {
-        await this.client.authenticate(auth_method, options);
+    ): Promise<GrantResponse> {
+        return await this.client.authenticate(auth_method, options);
     }
 
     setAccessToken(access_token: string): void {

package/src/model/AnomaliePEI.ts

@@ -0,0 +1,9 @@
+import { AnomalieDECI } from '../../src/model/AnomalieDECI';
+
+export type AnomaliePEI = {
+    'anomalie'?: AnomalieDECI;
+    'date_debut'?: Date;
+    'date_fin'?: Date;
+    'est_programmee'?: boolean;
+    'date_pose'?: Date;
+};

package/src/model/{DescriptifTechnique.ts → DescriptifTechniqueDECI.ts}

@@ -1,7 +1,12 @@
 import { DescriptifTechniquePENA } from '../../src/model/DescriptifTechniquePENA';
 import { DescriptifTechniquePIBI } from '../../src/model/DescriptifTechniquePIBI';
 
-export type DescriptifTechnique = DescriptifTechniquePIBI | DescriptifTechniquePENA;
+export type DescriptifTechniqueDECI = DescriptifTechniquePIBI | DescriptifTechniquePENA;
+
+export enum TypeEnum {
+    Pibi = 'PIBI',
+    Pena = 'PENA'
+}
 
 export enum DomanialiteEnum {
     Privee = 'privee',
@@ -9,6 +14,15 @@ export enum DomanialiteEnum {
     PriveeConventionnee = 'privee_conventionnee'
 }
 
+export enum StatutEnum {
+    RepriseDeDonnees = 'reprise_de_donnees',
+    DeclarationEnCours = 'declaration_en_cours',
+    ReconnaissanceOperationnelleInitiale = 'reconnaissance_operationnelle_initiale',
+    Actif = 'actif',
+    Projet = 'projet',
+    Reforme = 'reforme'
+}
+
 export enum NatureEnum {
     PointAspiration = 'POINT_ASPIRATION',
     CiterneAerienne = 'CITERNE_AERIENNE',
@@ -23,24 +37,3 @@ export enum NatureEnum {
     PoteauAspiration2x100 = 'POTEAU_ASPIRATION_2x100',
     BoucheAspiration1x100 = 'BOUCHE_ASPIRATION_1x100'
 }
-
-export enum CaracteristiquesParticulieresEnum {
-    Renversable = 'RENVERSABLE',
-    PreMelange = 'PRE_MELANGE'
-}
-
-export enum EssaisEnginUtiliseEnum {
-    Aucun = 'AUCUN',
-    Fpt = 'FPT',
-    Mpr = 'MPR',
-    Ccf = 'CCF'
-}
-
-export enum EquipementsEnum {
-    Guichet = 'GUICHET',
-    CanneAspiration = 'CANNE_ASPIRATION',
-    Puit = 'PUIT',
-    TrouHomme = 'TROU_HOMME',
-    RaccordTournant = 'RACCORD_TOURNANT',
-    PriseDirecte = 'PRISE_DIRECTE'
-}

package/src/model/DescriptifTechniqueDECIBase.ts

@@ -1,19 +1,36 @@
-import { AnomalieDECI } from '../../src/model/AnomalieDECI';
+import { AnomaliePEI } from '../../src/model/AnomaliePEI';
 
-import { DescriptifTechniqueBase } from '../model/DescriptifTechniqueBase';
-
-export type DescriptifTechniqueDECIBase = DescriptifTechniqueBase & { 
-    'anomalies'?: Array<AnomalieDECI>;
+export type DescriptifTechniqueDECIBase = {
+    'id'?: string;
+    'type'?: TypeEnum;
+    'anomalies'?: Array<AnomaliePEI>;
     'est_reglementaire'?: boolean;
-    'est_reforme'?: boolean;
     'domanialite'?: DomanialiteEnum;
-    'est_conforme'?: boolean;
+    'est_conforme_rddeci'?: boolean;
     'performance_theorique'?: number;
     'performance_reelle'?: number;
+    'observations_generales'?: string;
+    'date'?: Date;
+    'statut'?: StatutEnum;
+    'est_disponible'?: boolean;
 };
 
+export enum TypeEnum {
+    Pibi = 'PIBI',
+    Pena = 'PENA'
+}
+
 export enum DomanialiteEnum {
     Privee = 'privee',
     Publique = 'publique',
     PriveeConventionnee = 'privee_conventionnee'
 }
+
+export enum StatutEnum {
+    RepriseDeDonnees = 'reprise_de_donnees',
+    DeclarationEnCours = 'declaration_en_cours',
+    ReconnaissanceOperationnelleInitiale = 'reconnaissance_operationnelle_initiale',
+    Actif = 'actif',
+    Projet = 'projet',
+    Reforme = 'reforme'
+}

package/src/model/DescriptifTechniquePENA.ts

@@ -1,36 +1,28 @@
-import { DescriptifTechniquePENAAllOfRealimentation } from '../../src/model/DescriptifTechniquePENAAllOfRealimentation';
-import { DescriptifTechniquePENAAllOfVolumes } from '../../src/model/DescriptifTechniquePENAAllOfVolumes';
-
 import { DescriptifTechniqueDECIBase } from '../model/DescriptifTechniqueDECIBase';
 
 export type DescriptifTechniquePENA = DescriptifTechniqueDECIBase & { 
-    'essais_engin_utilise'?: EssaisEnginUtiliseEnum;
-    'equipements'?: EquipementsEnum;
     'nature'?: NatureEnum;
-    'volumes'?: DescriptifTechniquePENAAllOfVolumes;
-    'realimentation'?: Array<DescriptifTechniquePENAAllOfRealimentation>;
+    'volume'?: number;
 };
 
+export enum TypeEnum {
+    Pibi = 'PIBI',
+    Pena = 'PENA'
+}
+
 export enum DomanialiteEnum {
     Privee = 'privee',
     Publique = 'publique',
     PriveeConventionnee = 'privee_conventionnee'
 }
 
-export enum EssaisEnginUtiliseEnum {
-    Aucun = 'AUCUN',
-    Fpt = 'FPT',
-    Mpr = 'MPR',
-    Ccf = 'CCF'
-}
-
-export enum EquipementsEnum {
-    Guichet = 'GUICHET',
-    CanneAspiration = 'CANNE_ASPIRATION',
-    Puit = 'PUIT',
-    TrouHomme = 'TROU_HOMME',
-    RaccordTournant = 'RACCORD_TOURNANT',
-    PriseDirecte = 'PRISE_DIRECTE'
+export enum StatutEnum {
+    RepriseDeDonnees = 'reprise_de_donnees',
+    DeclarationEnCours = 'declaration_en_cours',
+    ReconnaissanceOperationnelleInitiale = 'reconnaissance_operationnelle_initiale',
+    Actif = 'actif',
+    Projet = 'projet',
+    Reforme = 'reforme'
 }
 
 export enum NatureEnum {

package/src/model/DescriptifTechniquePIBI.ts

@@ -1,5 +1,3 @@
-import { DescriptifTechniquePIBIAllOfPesees } from '../../src/model/DescriptifTechniquePIBIAllOfPesees';
-
 import { DescriptifTechniqueDECIBase } from '../model/DescriptifTechniqueDECIBase';
 
 export type DescriptifTechniquePIBI = DescriptifTechniqueDECIBase & { 
@@ -9,16 +7,32 @@ export type DescriptifTechniquePIBI = DescriptifTechniqueDECIBase & {
     */
     'surpression'?: number;
     'nature'?: NatureEnum;
-    'caracteristiques_particulieres'?: CaracteristiquesParticulieresEnum;
-    'pesees'?: DescriptifTechniquePIBIAllOfPesees;
+    'debit_1bar'?: number;
+    'pression'?: number;
+    'pression_statique'?: number;
+    'debit_gueule_bee'?: number;
 };
 
+export enum TypeEnum {
+    Pibi = 'PIBI',
+    Pena = 'PENA'
+}
+
 export enum DomanialiteEnum {
     Privee = 'privee',
     Publique = 'publique',
     PriveeConventionnee = 'privee_conventionnee'
 }
 
+export enum StatutEnum {
+    RepriseDeDonnees = 'reprise_de_donnees',
+    DeclarationEnCours = 'declaration_en_cours',
+    ReconnaissanceOperationnelleInitiale = 'reconnaissance_operationnelle_initiale',
+    Actif = 'actif',
+    Projet = 'projet',
+    Reforme = 'reforme'
+}
+
 export enum NatureEnum {
     Pi1x65 = 'PI1x65',
     Pi1x65Pi2x45 = 'PI1x65+PI2x45',
@@ -29,8 +43,3 @@ export enum NatureEnum {
     Bi1x100 = 'BI1x100',
     Bi2x100 = 'BI2x100'
 }
-
-export enum CaracteristiquesParticulieresEnum {
-    Renversable = 'RENVERSABLE',
-    PreMelange = 'PRE_MELANGE'
-}

package/src/model/PEI.ts

@@ -1,14 +1,38 @@
 import { AdressePostale } from '../../src/model/AdressePostale';
-import { DescriptifTechnique } from '../../src/model/DescriptifTechnique';
+import { DescriptifTechniqueDECIBase } from '../../src/model/DescriptifTechniqueDECIBase';
 import { PEIReferencesExterieuresInner } from '../../src/model/PEIReferencesExterieuresInner';
 
 export type PEI = {
     'id'?: string;
     'date_de_realisation'?: Date;
     'date_de_derniere_mise_a_jour'?: Date;
-    'statut'?: string;
     'references_exterieures'?: Array<PEIReferencesExterieuresInner>;
-    'descriptif_technique'?: DescriptifTechnique;
-    'geometrie'?: string;
-    'adresse_postale'?: AdressePostale;
+    'descriptif_technique'?: DescriptifTechniqueDECIBase;
+    'implantation'?: AdressePostale;
+    'genre'?: GenreEnum;
+    'numero'?: string;
+    'numero_compteur'?: string;
 };
+
+export enum GenreEnum {
+    Pi1x65 = 'PI1x65',
+    Pi1x65Pi2x45 = 'PI1x65+PI2x45',
+    Pi1x100 = 'PI1x100',
+    Pi2x100 = 'PI2x100',
+    Bi1x65 = 'BI1x65',
+    Bi1x80 = 'BI1x80',
+    Bi1x100 = 'BI1x100',
+    Bi2x100 = 'BI2x100',
+    PointAspiration = 'POINT_ASPIRATION',
+    CiterneAerienne = 'CITERNE_AERIENNE',
+    CiterneEnterree = 'CITERNE_ENTERREE',
+    CiterneSemiEnterree = 'CITERNE_SEMI_ENTERREE',
+    CiterneSouple = 'CITERNE_SOUPLE',
+    ReserveAerienne = 'RESERVE_AERIENNE',
+    PoteauRelais = 'POTEAU_RELAIS',
+    PuisardAspiration = 'PUISARD_ASPIRATION',
+    PriseDeportee = 'PRISE_DEPORTEE',
+    PoteauAspiration1x100 = 'POTEAU_ASPIRATION_1x100',
+    PoteauAspiration2x100 = 'POTEAU_ASPIRATION_2x100',
+    BoucheAspiration1x100 = 'BOUCHE_ASPIRATION_1x100'
+}

package/lib/model/DescriptifTechnique.js

@@ -1,45 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EquipementsEnum = exports.EssaisEnginUtiliseEnum = exports.CaracteristiquesParticulieresEnum = exports.NatureEnum = exports.DomanialiteEnum = void 0;
-var DomanialiteEnum;
-(function (DomanialiteEnum) {
-    DomanialiteEnum["Privee"] = "privee";
-    DomanialiteEnum["Publique"] = "publique";
-    DomanialiteEnum["PriveeConventionnee"] = "privee_conventionnee";
-})(DomanialiteEnum = exports.DomanialiteEnum || (exports.DomanialiteEnum = {}));
-var NatureEnum;
-(function (NatureEnum) {
-    NatureEnum["PointAspiration"] = "POINT_ASPIRATION";
-    NatureEnum["CiterneAerienne"] = "CITERNE_AERIENNE";
-    NatureEnum["CiterneEnterree"] = "CITERNE_ENTERREE";
-    NatureEnum["CiterneSemiEnterree"] = "CITERNE_SEMI_ENTERREE";
-    NatureEnum["CiterneSouple"] = "CITERNE_SOUPLE";
-    NatureEnum["ReserveAerienne"] = "RESERVE_AERIENNE";
-    NatureEnum["PoteauRelais"] = "POTEAU_RELAIS";
-    NatureEnum["PuisardAspiration"] = "PUISARD_ASPIRATION";
-    NatureEnum["PriseDeportee"] = "PRISE_DEPORTEE";
-    NatureEnum["PoteauAspiration1x100"] = "POTEAU_ASPIRATION_1x100";
-    NatureEnum["PoteauAspiration2x100"] = "POTEAU_ASPIRATION_2x100";
-    NatureEnum["BoucheAspiration1x100"] = "BOUCHE_ASPIRATION_1x100";
-})(NatureEnum = exports.NatureEnum || (exports.NatureEnum = {}));
-var CaracteristiquesParticulieresEnum;
-(function (CaracteristiquesParticulieresEnum) {
-    CaracteristiquesParticulieresEnum["Renversable"] = "RENVERSABLE";
-    CaracteristiquesParticulieresEnum["PreMelange"] = "PRE_MELANGE";
-})(CaracteristiquesParticulieresEnum = exports.CaracteristiquesParticulieresEnum || (exports.CaracteristiquesParticulieresEnum = {}));
-var EssaisEnginUtiliseEnum;
-(function (EssaisEnginUtiliseEnum) {
-    EssaisEnginUtiliseEnum["Aucun"] = "AUCUN";
-    EssaisEnginUtiliseEnum["Fpt"] = "FPT";
-    EssaisEnginUtiliseEnum["Mpr"] = "MPR";
-    EssaisEnginUtiliseEnum["Ccf"] = "CCF";
-})(EssaisEnginUtiliseEnum = exports.EssaisEnginUtiliseEnum || (exports.EssaisEnginUtiliseEnum = {}));
-var EquipementsEnum;
-(function (EquipementsEnum) {
-    EquipementsEnum["Guichet"] = "GUICHET";
-    EquipementsEnum["CanneAspiration"] = "CANNE_ASPIRATION";
-    EquipementsEnum["Puit"] = "PUIT";
-    EquipementsEnum["TrouHomme"] = "TROU_HOMME";
-    EquipementsEnum["RaccordTournant"] = "RACCORD_TOURNANT";
-    EquipementsEnum["PriseDirecte"] = "PRISE_DIRECTE";
-})(EquipementsEnum = exports.EquipementsEnum || (exports.EquipementsEnum = {}));

package/lib/model/DescriptifTechniqueBase.d.ts

@@ -1,5 +0,0 @@
-export type DescriptifTechniqueBase = {
-    'libelle'?: string;
-    'observations_generales'?: string;
-    'date'?: Date;
-};

package/lib/model/DescriptifTechniquePENAAllOfRealimentation.d.ts

@@ -1,10 +0,0 @@
-export type DescriptifTechniquePENAAllOfRealimentation = {
-    'debit'?: number;
-    'diametre_canalisation'?: number;
-    'nature'?: NatureEnum;
-};
-export declare enum NatureEnum {
-    AdductionEau = "ADDUCTION_EAU",
-    Toiture = "TOITURE",
-    Autre = "AUTRE"
-}

package/lib/model/DescriptifTechniquePENAAllOfRealimentation.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NatureEnum = void 0;
-var NatureEnum;
-(function (NatureEnum) {
-    NatureEnum["AdductionEau"] = "ADDUCTION_EAU";
-    NatureEnum["Toiture"] = "TOITURE";
-    NatureEnum["Autre"] = "AUTRE";
-})(NatureEnum = exports.NatureEnum || (exports.NatureEnum = {}));

package/lib/model/DescriptifTechniquePENAAllOfVolumes.d.ts

@@ -1,4 +0,0 @@
-export type DescriptifTechniquePENAAllOfVolumes = {
-    'reel'?: number;
-    'theorique'?: number;
-};

package/lib/model/DescriptifTechniquePENAAllOfVolumes.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/lib/model/DescriptifTechniquePIBIAllOfPesees.d.ts

@@ -1,6 +0,0 @@
-export type DescriptifTechniquePIBIAllOfPesees = {
-    'debit_1bar'?: number;
-    'pression_debit_requis'?: number;
-    'pression_statique'?: number;
-    'debit_gueule_bee'?: number;
-};

package/lib/model/DescriptifTechniquePIBIAllOfPesees.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/src/model/DescriptifTechniqueBase.ts

@@ -1,5 +0,0 @@
-export type DescriptifTechniqueBase = {
-    'libelle'?: string;
-    'observations_generales'?: string;
-    'date'?: Date;
-};

package/src/model/DescriptifTechniquePENAAllOfRealimentation.ts

@@ -1,11 +0,0 @@
-export type DescriptifTechniquePENAAllOfRealimentation = {
-    'debit'?: number;
-    'diametre_canalisation'?: number;
-    'nature'?: NatureEnum;
-};
-
-export enum NatureEnum {
-    AdductionEau = 'ADDUCTION_EAU',
-    Toiture = 'TOITURE',
-    Autre = 'AUTRE'
-}

package/src/model/DescriptifTechniquePENAAllOfVolumes.ts

@@ -1,4 +0,0 @@
-export type DescriptifTechniquePENAAllOfVolumes = {
-    'reel'?: number;
-    'theorique'?: number;
-};

package/src/model/DescriptifTechniquePIBIAllOfPesees.ts

@@ -1,6 +0,0 @@
-export type DescriptifTechniquePIBIAllOfPesees = {
-    'debit_1bar'?: number;
-    'pression_debit_requis'?: number;
-    'pression_statique'?: number;
-    'debit_gueule_bee'?: number;
-};