@communecter/cocolight-api-client 1.0.8 → 1.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@communecter/cocolight-api-client",
-    "version": "1.0.8",
+    "version": "1.0.10",
     "description": "Client Axios simplifié pour l'API cocolight",
     "repository": {
         "type": "git",
@@ -32,7 +32,8 @@
         "generate:testdata": "node ./scripts/generate-test-data.js",
         "generate:reponses": "node ./scripts/generate-constant-response-200.js",
         "generate:methodeapi": "node ./scripts/generate-methode-api.js",
-        "generate:ajv-standalone": "node ./scripts/generate-validate-function-ajv.js"
+        "generate:ajv-standalone": "node ./scripts/generate-validate-function-ajv.js",
+        "generate:entities": "node scripts/generate-entities.js"
     },
     "keywords": [
         "communecter",
@@ -60,7 +61,8 @@
         "jwt-decode": "^4.0.0",
         "pino": "^9.6.0",
         "pino-pretty": "^13.0.0",
-        "file-type": "^20.4.1"
+        "file-type": "^20.4.1",
+        "bson-objectid": "^2.0.4"
     },
     "devDependencies": {
         "@babel/core": "^7.26.10",
@@ -72,6 +74,7 @@
         "axios": "^1.4.0",
         "axios-retry": "^4.5.0",
         "file-type": "^20.4.1",
+        "bson-objectid": "^2.0.4",
         "babel-jest": "^29.7.0",
         "babel-loader": "^10.0.0",
         "ejson": "^2.2.3",

package/src/Api.js

@@ -1,4 +1,6 @@
 // Api.js
+import EndpointApi from "./api/EndpointApi.js";
+import { News } from "./api/News.js";
 import { Organization } from "./api/Organization.js";
 import { Project } from "./api/Project.js";
 import { User } from "./api/User.js";
@@ -75,12 +77,14 @@ export default class Api {
   /**
    * Retourne l'utilisateur connecté.
    *
-   * @returns {User} L'utilisateur connecté.
+   * @returns {Promise<User>} L'utilisateur connecté.
+   * @throws {ApiAuthenticationError} Si l'utilisateur n'est pas authentifié.
    */
-  me() {
+  async me() {
     if (!this._loggedUser) {
       throw new ApiAuthenticationError("Accès refusé : utilisateur non authentifié.");
     }
+    await this._loggedUser.get();
     return this._loggedUser;
   }
 
@@ -88,11 +92,18 @@ export default class Api {
    * Crée une instance User pour un utilisateur donné (autre que le connecté).
    *
    * @param {Object} userData - Les données de l'utilisateur public.
-   * @returns {User}
+   * @returns {Promise<User>} Une promesse qui résout l'instance User.
+   * @throws {Error} Si une erreur se produit lors de la création de l'utilisateur.
    */
-  user(userData) {
+  async user(userData) {
     try {
-      return new User(this._client, userData);
+      if (!userData.id && !userData.slug) {
+        return new User(this._client, userData, { EndpointApi, Organization, Project, News });
+      } else {
+        const user = new User(this._client, userData, { EndpointApi, Organization, Project, News });
+        await user.get();
+        return user;
+      }
     } catch (error) {
       console.error("[Api.user] Erreur lors de la création d'un objet utilisateur public :", error.message);
       throw error;
@@ -104,18 +115,17 @@ export default class Api {
    * Creates an Organization object and optionally retrieves its profile.
    *
    * @param {Object} organizationData - The data required to initialize the Organization object.
-   * @param {Object} [options={ getProfile: true }] - Additional options for the organization creation.
-   * @param {boolean} [options.getProfile=true] - Whether to fetch the organization's profile after creation.
    * @returns {Promise<Organization>} A promise that resolves to the created Organization object.
    * @throws {Error} Throws an error if the organization creation or profile retrieval fails.
    */
-  async organization(organizationData, options = { getProfile: true }) {
+  async organization(organizationData) {
     try {
-      const oraganization = new Organization(this._client, organizationData);
-      if (options.getProfile) {
-        await oraganization.getProfil();
+      const organization = new Organization(this._client, organizationData, { EndpointApi, User, Project, News });
+      if (!organizationData.id && !organizationData.slug) {
+        throw new Error("Vous devez fournir un id ou un slug pour créer une instance Organization.");
       }
-      return oraganization;
+      await organization.get();
+      return organization;
     } catch (error) {
       console.error("[Api.organization] Erreur lors de la création d'un objet organisation :", error.message);
       throw error;
@@ -126,17 +136,16 @@ export default class Api {
    * Creates a new Project instance and optionally retrieves its profile.
    *
    * @param {Object} projectData - The data used to initialize the Project instance.
-   * @param {Object} [options={ getProfile: true }] - Additional options for project creation.
-   * @param {boolean} [options.getProfile=true] - Whether to retrieve the project's profile after creation.
    * @returns {Promise<Project>} A promise that resolves to the created Project instance.
    * @throws {Error} If an error occurs during project creation or profile retrieval.
    */
-  async project(projectData, options = { getProfile: true }) {
+  async project(projectData) {
     try {
-      const project = new Project(this._client, projectData);
-      if (options.getProfile) {
-        await project.getProfil();
+      const project = new Project(this._client, projectData, { User, News, EndpointApi });
+      if (!projectData.id && !projectData.slug) {
+        throw new Error("Vous devez fournir un id ou un slug pour créer une instance Project.");
       }
+      await project.get();
       return project;
     } catch (error) {
       console.error("[Api.project] Erreur lors de la création d'un objet projet :", error.message);
@@ -149,9 +158,17 @@ export default class Api {
    *
    * @returns {ApiClient}
    */
-
   get client() {
     return this._client;
   }
 
+  /**
+   * Retourne l'instance d'EndpointApi.
+   * 
+   * @returns {EndpointApi}
+   */
+  get endpointApi() {
+    return new EndpointApi(this._client);
+  }
+  
 }

package/src/ApiClient.js

@@ -51,6 +51,8 @@ export default class ApiClient extends EventEmitter {
       throw new ApiClientError("Le paramètre \"baseURL\" est obligatoire.", 500);
     }
 
+    this.__entityTag = "ApiClient";
+    
     this._baseURL = baseURL;
     this._refreshToken = refreshToken;
     this._refreshUrl = refreshUrl;
@@ -78,8 +80,14 @@ export default class ApiClient extends EventEmitter {
     this._ajv = new Ajv({ strict: false, useDefaults: true, allErrors: true, verbose: true });
     addFormats(this._ajv);
 
+    this._ajv.addKeyword({
+      keyword: "startBeforeEnd",
+      type: "object",
+      errors: true,
+      validate: this._startBeforeEndValidate
+    });
+
     // Pino logger
-    // (Ici en mode pretty-print sur la console, tu peux configurer comme tu veux)
     this._logger = pino({
       transport: {
         target: "pino-pretty",
@@ -582,9 +590,9 @@ export default class ApiClient extends EventEmitter {
       const validateRequest = this._ajv.compile(schemaToCompile);
       const valid = validateRequest(cleanedData);
       if (!valid) {
-        const errorMessages = this._ajvErrorHuman(validateRequest.errors);
+        const errorMessages = validateRequest.errors ? this._ajvErrorHuman(validateRequest.errors) : [];
         this.emit("validationError", { stage: "request", errors: validateRequest.errors });
-        throw new ApiValidationError("Request validation failed.", 400, errorMessages, validateRequest.errors);
+        throw new ApiValidationError("Request validation failed.", 400, errorMessages , validateRequest.errors);
       }
 
       data = this._resolveSpecialValuesInPlace(cleanedData, resolvedParams);
@@ -679,11 +687,16 @@ export default class ApiClient extends EventEmitter {
     } catch (error) {
       this._updateCircuitBreakerError();
       this._logger.error(`[ApiClient] Erreur lors de l'appel de ${constant}: ${error.message}`);
-      throw new ApiClientError(
-        `Erreur lors de l'appel de l'API : ${error.message}`,
-        error.response ? error.response.status : 500,
-        error.response ? error.response.data : null
-      );
+      if(error instanceof ApiValidationError) {
+        throw error;
+      } else {
+        throw new ApiClientError(
+          `Erreur lors de l'appel de l'API : ${error.message}`,
+          error.response ? error.response.status : 500,
+          error.response ? error.response.data : null
+        );
+      }
+
     }
   }
   
@@ -694,9 +707,14 @@ export default class ApiClient extends EventEmitter {
    * @returns {Array<string>} An array of human-readable error messages extracted from the AJV errors.
    */
   _ajvErrorHuman(errors){
-    const errorsMessages = new AggregateAjvError(errors);
-    const messages = errorsMessages.errors.map(({ message }) => message);
-    return messages;
+    try {
+      const errorsMessages = new AggregateAjvError(errors);
+      const messages = errorsMessages.errors.map(({ message }) => message);
+      return messages;
+    } catch (e) {
+      this._logger.error("[ApiClient] _ajvErrorHuman", e);
+      return errors.map(({ message }) => message);
+    }
   }
 
   /**
@@ -1343,5 +1361,32 @@ export default class ApiClient extends EventEmitter {
     return data;
   }
 
+  _startBeforeEndValidate = (schema, data) => {
+    if (!data.startDate || !data.endDate) return true;
+  
+    const isValid = new Date(data.startDate) < new Date(data.endDate);
+    if (!isValid) {
+      this._startBeforeEndValidate.errors = [
+        {
+          instancePath: "", // ou "." si tu veux le chemin actuel
+          schemaPath: "#/startBeforeEnd",
+          keyword: "startBeforeEnd",
+          params: {},
+          message: "startDate must be before endDate"
+        }
+      ];
+    }
+    return isValid;
+  };
+  
+
+  getRequestSchema(constant) {
+    const endpoint = this._endpoints.find(e => e.constant === constant);
+    return endpoint?.request || null;
+  }
+
+  getPathSchema(constant) {
+    return this._endpoints.find(e => e.constant === constant)?.pathParams || null;
+  }
 
 }