@communecter/cocolight-api-client 1.0.123 → 1.0.125

package/src/api/Poi.ts

@@ -1,6 +1,7 @@
 import { ApiError } from "../error.js";
 import { BaseEntity } from "./BaseEntity.js";
 import { PoiItemNormalized } from "./serverDataType/Poi.js";
+import { transformEntityRefs } from "../types/transforms.js";
 
 import type { AddPoiData } from "./EndpointApi.types.js";
 
@@ -39,9 +40,12 @@ export class Poi extends BaseEntity<PoiItemNormalized> {
     "typeElement"
   ];
 
-  // transforms = {
-
-  // };
+  // Le serveur enrichit `parent` avec _id/slug/id/profilThumbImageUrl/etc. qui ne sont
+  // pas dans le schéma d'envoi (additionalProperties: false → name, type seuls).
+  // On filtre via transformEntityRefs à la construction du draft (pattern identique à Event).
+  override transforms: Record<string, (val: any, full?: any) => any> = {
+    parent: transformEntityRefs,
+  };
 
   override _add = async (payload: Record<string, any>): Promise<void> => {
     if (!this._calledFromSave) {
@@ -98,7 +102,13 @@ export class Poi extends BaseEntity<PoiItemNormalized> {
 
   async addPoi(data: Partial<AddPoiData> = {}): Promise<unknown> {
 
-    if (!this.isMe && this.parent) {
+    // Si le parent direct n'est pas l'utilisateur connecté (ex: création via une org),
+    // on injecte le parent dans le payload. Sans ça, le default schéma `{ "@userId": ... }`
+    // pose me comme parent — ce qui est faux pour `me.org().poi()`.
+    // NB: this.isMe est trompeur ici car userContext propage jusqu'au User connecté
+    // (donc isMe=true même quand le parent direct est une org).
+    // Si le caller fournit déjà `data.parent`, on respecte sa valeur (pas de merge automatique).
+    if (this.parent && this.parent.id && this.parent.id !== this.userId && !(data as any).parent) {
       (data as any).parent = {};
       (data as any).parent[`${this.parent.id}`] = {
         type: this.parent.getEntityType(),

package/src/api/Project.ts

@@ -125,8 +125,13 @@ export class Project extends BaseEntity<ProjectItemNormalized> {
    */
   async addProject(data: Partial<AddProjectData> = {}): Promise<unknown> {
 
-    // le parent n'est pas me donc on doit ajouter le parent
-    if (!this.isMe && this.parent) {
+    // Si le parent direct n'est pas l'utilisateur connecté (ex: création via une org),
+    // on injecte le parent dans le payload. Sans ça, le default schéma `{ "@userId": ... }`
+    // pose me comme parent — ce qui est faux pour `me.org().project()`.
+    // NB: this.isMe est trompeur ici car userContext propage jusqu'au User connecté
+    // (donc isMe=true même quand le parent direct est une org).
+    // Si le caller fournit déjà `data.parent`, on respecte sa valeur (pas de merge automatique).
+    if (this.parent && this.parent.id && this.parent.id !== this.userId && !data.parent) {
       data.parent = {};
       data.parent[`${this.parent.id}`] = {
         type: this.parent.getEntityType(),

package/src/api/User.ts

@@ -112,6 +112,7 @@ export class User extends BaseEntity<UserItemNormalized> {
       News: typeof import("./News.js").News;
       Comment: typeof import("./Comment.js").Comment;
       Answer: typeof import("./Answer.js").Answer;
+      Classified?: typeof import("./Classified.js").Classified;
     }
   ) {
     if(!deps.EndpointApi){

package/src/api/UserApi.ts

@@ -2,6 +2,7 @@ import ApiClient from "../ApiClient.js";
 import { ApiError, ApiResponseError } from "../error.js";
 import { Answer } from "./Answer.js";
 import { Badge } from "./Badge.js";
+import { Classified } from "./Classified.js";
 import { Comment } from "./Comment.js";
 import EndpointApi from "./EndpointApi.js";
 import { Event } from "./Event.js";
@@ -67,7 +68,7 @@ export class UserApi {
       this.loggedUser = new User(
         this.client,
         response.data.user,
-        { EndpointApi, Organization, Project, Event, Poi, Badge, News, Comment, Answer }
+        { EndpointApi, Organization, Project, Event, Poi, Badge, News, Comment, Answer, Classified }
       );
       return this.loggedUser;
     });
@@ -89,7 +90,7 @@ export class UserApi {
     this.loggedUser = new User(
       this.client,
       { id: this.client.userId },
-      { EndpointApi, Organization, Project, Event, Poi, Badge, News, Comment, Answer }
+      { EndpointApi, Organization, Project, Event, Poi, Badge, News, Comment, Answer, Classified }
     );
 
     return this.loggedUser;

package/src/api/serverDataType/Classified.ts

@@ -0,0 +1,152 @@
+import type {
+  GeoCoordinates,
+  GeoPosition,
+  IdObject,
+  ParentsMap,
+  PostalAddress,
+  DateValue
+} from "./common.js";
+import type EJSONType from "../../EJSONType.js";
+
+type ObjectIDCtor = typeof EJSONType["ObjectID"];
+type ObjectID = InstanceType<ObjectIDCtor>;
+
+// ============================================================================
+// SECTIONS
+// ============================================================================
+
+export const CLASSIFIED_SECTIONS = ["need", "offer"] as const;
+export type ClassifiedSection = (typeof CLASSIFIED_SECTIONS)[number];
+
+// ============================================================================
+// CATÉGORIES
+// ============================================================================
+
+export const CLASSIFIED_CATEGORIES = ["service", "competence", "material"] as const;
+export type ClassifiedCategory = (typeof CLASSIFIED_CATEGORIES)[number];
+
+// ============================================================================
+// SOUS-CATÉGORIES
+// ============================================================================
+
+export interface ClassifiedSubcatEntry {
+  key: string;
+  label: string;
+  icon: string;
+}
+
+export interface ClassifiedCategoryDef {
+  key: ClassifiedCategory;
+  icon: string;
+  label: string;
+  subcat: Record<string, ClassifiedSubcatEntry>;
+}
+
+export const CLASSIFIED_SUBCATEGORIES: Record<ClassifiedCategory, ClassifiedCategoryDef> = {
+  service: {
+    key: "service",
+    icon: "cogs",
+    label: "Service",
+    subcat: {
+      charity:            { key: "charity",            label: "Charité",                                      icon: "heart" },
+      education:          { key: "education",          label: "Aide éducative",                              icon: "book" },
+      househelp:          { key: "househelp",          label: "Aide ménagère",                               icon: "home" },
+      washing:            { key: "washing",            label: "Lavage",                                       icon: "droplets" },
+      gardening:          { key: "gardening",          label: "Jardinage",                                   icon: "flower" },
+      farming:            { key: "farming",            label: "Agriculture",                                  icon: "wheat" },
+      generalmaintenance: { key: "generalmaintenance", label: "Maintenance générale",                        icon: "wrench" },
+      childrencare:       { key: "childrencare",       label: "Garde d'enfants",                             icon: "baby" },
+      ederlycare:         { key: "ederlycare",         label: "Aide aux personnes âgées",                   icon: "user" },
+      disabledcare:       { key: "disabledcare",       label: "Aide aux personnes en situation de handicap", icon: "accessibility" },
+      hostinghelp:        { key: "hostinghelp",        label: "Aide à l'accueil",                            icon: "handshake" },
+      animalcare:         { key: "animalcare",         label: "Soins aux animaux",                          icon: "paw-print" },
+    },
+  },
+  competence: {
+    key: "competence",
+    icon: "bookmark",
+    label: "Compétence",
+    subcat: {
+      artistic:      { key: "artistic",      label: "Artistique",                   icon: "palette" },
+      laws:          { key: "laws",          label: "Droit",                         icon: "scale" },
+      itdevlopment:  { key: "itdevlopment",  label: "Développement informatique",   icon: "code" },
+      handcraft:     { key: "handcraft",     label: "Artisanat",                    icon: "scissors" },
+      animalcare:    { key: "animalcare",    label: "Soins aux animaux",            icon: "paw-print" },
+      agriculture:   { key: "agriculture",   label: "Agriculture",                  icon: "wheat" },
+      restauration:  { key: "restauration",  label: "Restauration",                 icon: "utensils" },
+      building:      { key: "building",      label: "Construction",                 icon: "hard-hat" },
+    },
+  },
+  material: {
+    key: "material",
+    icon: "wrench",
+    label: "Matériel",
+    subcat: {
+      electronic:        { key: "electronic",        label: "Électronique",            icon: "cpu" },
+      furniture:         { key: "furniture",         label: "Mobilier",                icon: "armchair" },
+      primaryressources: { key: "primaryressources", label: "Ressources primaires",    icon: "leaf" },
+      buildingtools:     { key: "buildingtools",     label: "Outils de construction",  icon: "hammer" },
+      gardeningtools:    { key: "gardeningtools",    label: "Outils de jardinage",     icon: "shovel" },
+      medicalstuff:      { key: "medicalstuff",      label: "Matériel médical",        icon: "stethoscope" },
+    },
+  },
+};
+
+// Union des clés de sous-catégories
+export type ServiceSubcat      = keyof typeof CLASSIFIED_SUBCATEGORIES.service.subcat;
+export type CompetenceSubcat   = keyof typeof CLASSIFIED_SUBCATEGORIES.competence.subcat;
+export type MaterialSubcat     = keyof typeof CLASSIFIED_SUBCATEGORIES.material.subcat;
+export type ClassifiedSubcat   = ServiceSubcat | CompetenceSubcat | MaterialSubcat;
+
+// ============================================================================
+// INTERFACES JSON / NORMALISÉES
+// ============================================================================
+
+export interface ClassifiedItemJson {
+  _id: IdObject;
+  collection: "classifieds";
+  name: string;
+  section: ClassifiedSection;
+  category: ClassifiedCategory;
+  subtype: ClassifiedSubcat;
+  created?: DateValue;
+  updated?: DateValue;
+  modified?: DateValue;
+  parent?: ParentsMap;
+  description?: string;
+  slug?: string;
+  address?: PostalAddress;
+  geo?: GeoCoordinates;
+  geoPosition?: GeoPosition;
+  tags?: string[];
+  creator?: string;
+  profilImageUrl?: string;
+  profilMediumImageUrl?: string;
+  profilThumbImageUrl?: string;
+  [key: string]: unknown;
+}
+
+export interface ClassifiedItemNormalized {
+  id: string;
+  _id: ObjectID;
+  collection: "classifieds";
+  name: string;
+  section: ClassifiedSection;
+  category: ClassifiedCategory;
+  subtype: ClassifiedSubcat;
+  created?: Date;
+  updated?: Date;
+  modified?: Date;
+  parent?: ParentsMap;
+  description?: string;
+  slug?: string;
+  address?: PostalAddress;
+  geo?: GeoCoordinates;
+  geoPosition?: GeoPosition;
+  tags?: string[];
+  creator?: string;
+  profilImageUrl?: string;
+  profilMediumImageUrl?: string;
+  profilThumbImageUrl?: string;
+  [key: string]: unknown;
+}