@blazeo.com/calendar-client 1.0.55 → 1.0.57

package/dist/index.d.ts

@@ -335,6 +335,77 @@ export const FlowModel: {
   create(snapshot?: FlowSnapshot, options?: { env?: object }): unknown;
 };
 
+export type ActivityLogSearchResult = {
+  activityLogs: unknown[];
+  totalCount: number;
+};
+
+export type ActivityLogSnapshot = {
+  id?: number | null;
+  activityLogId?: string;
+  leadId?: string | null;
+  eventId?: string | null;
+  activityTypeId?: number;
+  activityTypeName?: string;
+  categoryId?: number;
+  categoryName?: string;
+  isPartialData?: boolean;
+  userEmail?: string;
+  createdOn?: string | null;
+  data?: Record<string, string>;
+  activityLogDetails?: Array<{ key?: string; value?: string }>;
+};
+
+export const ActivityLogModel: {
+  get(opts: {
+    companyKey: string;
+    company_key?: string;
+    leadId?: string;
+    lead_id?: string;
+    eventId?: string;
+    event_id?: string;
+    activityTypeId?: number | string | number[];
+    activity_type_id?: number | string | number[];
+    activityTypeIds?: number | string | number[];
+    userEmail?: string;
+    user_email?: string;
+    fromDate?: string;
+    from_date?: string;
+    toDate?: string;
+    to_date?: string;
+    sortBy?: string;
+    sort?: string;
+    sort_column?: string;
+    sortOrder?: 'ASC' | 'DESC' | 'asc' | 'desc' | string;
+    sort_dir?: 'asc' | 'desc' | string;
+    searchColumn?: string;
+    search_column?: string;
+    column?: string;
+    searchText?: string;
+    search_text?: string;
+    search?: string;
+    filters?: Array<{
+      column?: string;
+      searchColumn?: string;
+      search_column?: string;
+      text?: string;
+      searchText?: string;
+      search_text?: string;
+      search?: string;
+    }>;
+    page?: number;
+    pageSize?: number;
+    page_size?: number;
+    skip?: number;
+    take?: number;
+  }): Promise<ActivityLogSearchResult | { status: 'failure'; message: string } | null>;
+  getByCompany(
+    companyKey: string,
+    opts?: Omit<Parameters<typeof ActivityLogModel.get>[0], 'companyKey'>
+  ): Promise<ActivityLogSearchResult | { status: 'failure'; message: string } | null>;
+  create(snapshot?: ActivityLogSnapshot, options?: { env?: object }): unknown;
+};
+
 export const LeadModel: {
   getRaw(leadId: string): Promise<{ status: string; data?: unknown; message?: string }>;
   get(leadId: string): Promise<unknown>;
@@ -567,3 +638,12 @@ export const RecurringFrequency: Record<string, number>;
 export const DayOfWeek: Record<string, number>;
 export const LocationType: Record<string, number>;
 export const EmailProvider: Record<string, number>;
+export const CalendarVisibility: Record<string, number>;
+export const ActivityLogType: {
+  AppointmentScheduled: 9;
+  AppointmentRescheduled: 10;
+  AppointmentCanceled: 11;
+};
+export const ActivityLogCategory: {
+  Appointments: 3;
+};

package/dist/index.js

@@ -19,6 +19,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/models/appointment/index.js
 var index_exports = {};
 __export(index_exports, {
+  ActivityLogCategory: () => ActivityLogCategory,
+  ActivityLogModel: () => ActivityLog_default,
+  ActivityLogType: () => ActivityLogType,
   AssetModel: () => Asset_default,
   AssignmentMethod: () => AssignmentMethod,
   AttendeeStatus: () => AttendeeStatus,
@@ -383,6 +386,14 @@ var CalendarVisibility = {
   Public: 0,
   Private: 1
 };
+var ActivityLogType = {
+  AppointmentScheduled: 9,
+  AppointmentRescheduled: 10,
+  AppointmentCanceled: 11
+};
+var ActivityLogCategory = {
+  Appointments: 3
+};
 
 // src/models/appointment/Event.js
 var import_mobx_state_tree4 = require("mobx-state-tree");
@@ -585,7 +596,7 @@ var EventModel = import_mobx_state_tree4.types.model("Event", {
       };
       return reqPost("/event/update", payload);
     },
-    /** POST /event/reschedule – reschedule event */
+    /** POST /event/reschedule – reschedule event and mark status ReScheduled */
     async reschedule(offsetMinutes) {
       const offset = offsetMinutes ?? getOffset();
       const payload = {
@@ -609,7 +620,12 @@ var EventModel = import_mobx_state_tree4.types.model("Event", {
         flowPath: self.flowPath ?? void 0
       };
       const res = await reqPost("/event/reschedule", payload, null, { headers: { offset: String(offset) } });
-      if (res.status === "success" && res.data) (0, import_mobx_state_tree4.applySnapshot)(self, { ...res.data, eventId: self.eventId });
+      if (res.status !== "success") return res;
+      if (res.data) {
+        (0, import_mobx_state_tree4.applySnapshot)(self, { ...mapEventFromApi(res.data), eventId: self.eventId });
+      } else if (self.status !== EventStatus.ReScheduled) {
+        await self.setEventStatus(EventStatus.ReScheduled);
+      }
       return res;
     },
     /** GET /event/cancel – cancel this event */
@@ -903,9 +919,17 @@ EventModel.reschedule = async (payload, offsetMinutes) => {
   const { reqPost } = createRequestHelpersFromEnv(getConfig());
   const offset = offsetMinutes ?? getDefaultOffset();
   const res = await reqPost("/event/reschedule", payload, null, { headers: { offset: String(offset) } });
-  if (res.status === "success" && res.data) {
+  if (res.status !== "success") return null;
+  const eventId = String((payload == null ? void 0 : payload.eventId) ?? (payload == null ? void 0 : payload.EventId) ?? (payload == null ? void 0 : payload.event_id) ?? "");
+  if (res.data) {
     return EventModel.create(mapEventFromApi(res.data), { env: getConfig() });
   }
+  if (eventId) {
+    const statusRes = await EventModel.setEventStatus(eventId, EventStatus.ReScheduled);
+    if (statusRes.status === "success" && statusRes.data) {
+      return EventModel.create(mapEventFromApi(statusRes.data), { env: getConfig() });
+    }
+  }
   return null;
 };
 EventModel.updateEvent = async (payload) => {
@@ -2965,20 +2989,170 @@ LeadModel.getSources = async (companyKey) => {
 };
 var Lead_default = LeadModel;
 
-// src/models/appointment/CustomField.js
+// src/models/appointment/ActivityLog.js
 var import_mobx_state_tree21 = require("mobx-state-tree");
-var CustomFieldModel = import_mobx_state_tree21.types.model("CustomField", {
+var ActivityLogDetailModel = import_mobx_state_tree21.types.model("ActivityLogDetail", {
+  key: import_mobx_state_tree21.types.optional(import_mobx_state_tree21.types.string, ""),
+  value: import_mobx_state_tree21.types.optional(import_mobx_state_tree21.types.string, "")
+});
+function mapActivityLogFromApi(d) {
+  if (!d) return d;
+  const pick2 = (...keys) => keys.reduce((v, k) => v ?? d[k], void 0);
+  const detailsRaw = pick2("activityLogDetails", "ActivityLogDetails");
+  const details = Array.isArray(detailsRaw) ? detailsRaw.map((row) => ({
+    key: pickDetail(row, "key", "Key") ?? "",
+    value: pickDetail(row, "value", "Value") ?? ""
+  })) : [];
+  const dataRaw = pick2("data", "Data");
+  const data = dataRaw && typeof dataRaw === "object" && !Array.isArray(dataRaw) ? { ...dataRaw } : details.reduce((acc, row) => {
+    if (row.key) acc[row.key] = row.value ?? "";
+    return acc;
+  }, {});
+  return {
+    id: pick2("id", "Id") ?? null,
+    activityLogId: pick2("activityLogId", "ActivityLogId", "activity_log_id") ?? "new",
+    leadId: pick2("leadId", "LeadId", "lead_id") ?? null,
+    eventId: pick2("eventId", "EventId", "event_id") ?? null,
+    activityTypeId: pick2("activityTypeId", "ActivityTypeId", "activity_type_id") ?? 0,
+    activityTypeName: pick2("activityTypeName", "ActivityTypeName", "activity_type_name") ?? "",
+    categoryId: pick2("categoryId", "CategoryId", "category_id") ?? 3,
+    categoryName: pick2("categoryName", "CategoryName", "category_name") ?? "Appointments",
+    isPartialData: pick2("isPartialData", "IsPartialData", "is_partial_data") ?? false,
+    userEmail: pick2("userEmail", "UserEmail", "user_email") ?? "",
+    createdOn: pick2("createdOn", "CreatedOn", "created_on") ?? null,
+    data,
+    activityLogDetails: details
+  };
+}
+function pickDetail(row, ...keys) {
+  if (!row) return void 0;
+  return keys.reduce((v, k) => v ?? row[k], void 0);
+}
+function normalizeActivityTypeIds(raw) {
+  if (raw == null) return null;
+  const values = Array.isArray(raw) ? raw : [raw];
+  const ids = [];
+  for (const value of values) {
+    if (value == null || value === "") continue;
+    const parts = String(value).split(",");
+    for (const part of parts) {
+      const trimmed = part.trim();
+      if (!trimmed) continue;
+      const n = Number(trimmed);
+      if (Number.isFinite(n)) ids.push(n);
+    }
+  }
+  return ids.length ? ids : null;
+}
+function buildActivityLogQuery(opts = {}) {
+  const companyKey = String(opts.companyKey ?? opts.company_key ?? opts.CompanyKey ?? "").trim();
+  const query = { company_key: companyKey };
+  const leadId = opts.leadId ?? opts.lead_id ?? opts.LeadId;
+  if (leadId != null && String(leadId).trim() !== "") query.lead_id = String(leadId).trim();
+  const eventId = opts.eventId ?? opts.event_id ?? opts.EventId;
+  if (eventId != null && String(eventId).trim() !== "") query.event_id = String(eventId).trim();
+  const userEmail = opts.userEmail ?? opts.user_email ?? opts.UserEmail;
+  if (userEmail != null && String(userEmail).trim() !== "") query.user_email = String(userEmail).trim();
+  const fromDate = opts.fromDate ?? opts.from_date ?? opts.FromDate;
+  if (fromDate != null && String(fromDate).trim() !== "") query.from_date = String(fromDate).trim();
+  const toDate = opts.toDate ?? opts.to_date ?? opts.ToDate;
+  if (toDate != null && String(toDate).trim() !== "") query.to_date = String(toDate).trim();
+  const activityTypeIds = normalizeActivityTypeIds(
+    opts.activityTypeId ?? opts.activity_type_id ?? opts.activityTypeIds ?? opts.activity_type_ids
+  );
+  if (activityTypeIds == null ? void 0 : activityTypeIds.length) {
+    query.activity_type_id = activityTypeIds.length === 1 ? activityTypeIds[0] : activityTypeIds.join(",");
+  }
+  const sortBy = opts.sortBy ?? opts.sort ?? opts.sort_column;
+  if (sortBy != null && sortBy !== "") query.sort = sortBy;
+  const sortOrderRaw = opts.sortOrder ?? opts.sort_dir;
+  if (sortOrderRaw != null && String(sortOrderRaw).trim() !== "") {
+    const u = String(sortOrderRaw).trim().toUpperCase();
+    query.sort_dir = u.startsWith("DESC") ? "desc" : "asc";
+  }
+  const filterPairs = [];
+  const searchColumn = opts.searchColumn ?? opts.search_column ?? opts.column;
+  const searchText = opts.searchText ?? opts.search_text ?? opts.search;
+  const singleColumn = searchColumn != null ? String(searchColumn).trim() : "";
+  const singleText = searchText != null ? String(searchText).trim() : "";
+  if (singleColumn && singleText) filterPairs.push({ column: singleColumn, text: singleText });
+  if (Array.isArray(opts.filters)) {
+    for (const f of opts.filters) {
+      const column = String((f == null ? void 0 : f.column) ?? (f == null ? void 0 : f.searchColumn) ?? (f == null ? void 0 : f.search_column) ?? "").trim();
+      const text = String((f == null ? void 0 : f.text) ?? (f == null ? void 0 : f.searchText) ?? (f == null ? void 0 : f.search_text) ?? (f == null ? void 0 : f.search) ?? "").trim();
+      if (column && text) filterPairs.push({ column, text });
+    }
+  }
+  if (filterPairs.length) {
+    query.search_column = filterPairs.map((f) => f.column);
+    query.search_text = filterPairs.map((f) => f.text);
+  }
+  if (opts.page != null) {
+    query.page = opts.page;
+    if (opts.page_size != null) query.page_size = opts.page_size;
+    else if (opts.pageSize != null) query.page_size = opts.pageSize;
+  } else {
+    if (opts.skip != null) query.skip = opts.skip;
+    if (opts.take != null) query.take = opts.take;
+  }
+  return { companyKey, query };
+}
+var ActivityLogModel = import_mobx_state_tree21.types.model("ActivityLog", {
   id: import_mobx_state_tree21.types.optional(import_mobx_state_tree21.types.maybeNull(import_mobx_state_tree21.types.number), null),
-  customFieldId: import_mobx_state_tree21.types.optional(import_mobx_state_tree21.types.maybeNull(import_mobx_state_tree21.types.string), null),
-  calendarId: import_mobx_state_tree21.types.optional(import_mobx_state_tree21.types.maybeNull(import_mobx_state_tree21.types.string), null),
-  label: import_mobx_state_tree21.types.optional(import_mobx_state_tree21.types.maybeNull(import_mobx_state_tree21.types.string), null),
-  type: import_mobx_state_tree21.types.optional(import_mobx_state_tree21.types.string, ""),
-  isRequired: import_mobx_state_tree21.types.optional(import_mobx_state_tree21.types.boolean, false),
+  activityLogId: import_mobx_state_tree21.types.optional(import_mobx_state_tree21.types.identifier, "new"),
+  leadId: import_mobx_state_tree21.types.optional(import_mobx_state_tree21.types.maybeNull(import_mobx_state_tree21.types.string), null),
+  eventId: import_mobx_state_tree21.types.optional(import_mobx_state_tree21.types.maybeNull(import_mobx_state_tree21.types.string), null),
+  activityTypeId: import_mobx_state_tree21.types.optional(import_mobx_state_tree21.types.number, 0),
+  activityTypeName: import_mobx_state_tree21.types.optional(import_mobx_state_tree21.types.string, ""),
+  categoryId: import_mobx_state_tree21.types.optional(import_mobx_state_tree21.types.number, 3),
+  categoryName: import_mobx_state_tree21.types.optional(import_mobx_state_tree21.types.string, "Appointments"),
+  isPartialData: import_mobx_state_tree21.types.optional(import_mobx_state_tree21.types.boolean, false),
+  userEmail: import_mobx_state_tree21.types.optional(import_mobx_state_tree21.types.string, ""),
   createdOn: import_mobx_state_tree21.types.optional(import_mobx_state_tree21.types.maybeNull(import_mobx_state_tree21.types.string), null),
-  modifiedOn: import_mobx_state_tree21.types.optional(import_mobx_state_tree21.types.maybeNull(import_mobx_state_tree21.types.string), null),
-  isDeleted: import_mobx_state_tree21.types.optional(import_mobx_state_tree21.types.boolean, false)
+  data: import_mobx_state_tree21.types.optional(import_mobx_state_tree21.types.frozen(), {}),
+  activityLogDetails: import_mobx_state_tree21.types.optional(import_mobx_state_tree21.types.array(ActivityLogDetailModel), [])
+}).actions((self) => ({
+  /** GET /activitylog/get – pass companyKey in opts (required). */
+  async get(opts = {}) {
+    return ActivityLogModel.get(opts);
+  }
+}));
+ActivityLogModel.get = async (opts = {}) => {
+  const { companyKey, query } = buildActivityLogQuery(opts);
+  if (!companyKey) return { status: "failure", message: "companyKey is required" };
+  const { reqGet } = createRequestHelpersFromEnv(getConfig());
+  const res = await reqGet("/activitylog/get", query);
+  if (res.status === "success") {
+    const payload = res.data ?? {};
+    const logsRaw = Array.isArray(payload) ? payload : Array.isArray(payload.ActivityLogs) ? payload.ActivityLogs : Array.isArray(payload.activityLogs) ? payload.activityLogs : null;
+    if (logsRaw) {
+      const activityLogs = logsRaw.map(
+        (row) => ActivityLogModel.create(mapActivityLogFromApi(row), { env: getConfig() })
+      );
+      const totalCountRaw = payload.TotalCount ?? payload.totalCount;
+      const totalCount = Number.isFinite(Number(totalCountRaw)) ? Number(totalCountRaw) : activityLogs.length;
+      return { activityLogs, totalCount };
+    }
+  }
+  return null;
+};
+ActivityLogModel.getByCompany = async (companyKey, opts = {}) => ActivityLogModel.get({ ...opts, companyKey });
+var ActivityLog_default = ActivityLogModel;
+
+// src/models/appointment/CustomField.js
+var import_mobx_state_tree22 = require("mobx-state-tree");
+var CustomFieldModel = import_mobx_state_tree22.types.model("CustomField", {
+  id: import_mobx_state_tree22.types.optional(import_mobx_state_tree22.types.maybeNull(import_mobx_state_tree22.types.number), null),
+  customFieldId: import_mobx_state_tree22.types.optional(import_mobx_state_tree22.types.maybeNull(import_mobx_state_tree22.types.string), null),
+  calendarId: import_mobx_state_tree22.types.optional(import_mobx_state_tree22.types.maybeNull(import_mobx_state_tree22.types.string), null),
+  label: import_mobx_state_tree22.types.optional(import_mobx_state_tree22.types.maybeNull(import_mobx_state_tree22.types.string), null),
+  type: import_mobx_state_tree22.types.optional(import_mobx_state_tree22.types.string, ""),
+  isRequired: import_mobx_state_tree22.types.optional(import_mobx_state_tree22.types.boolean, false),
+  createdOn: import_mobx_state_tree22.types.optional(import_mobx_state_tree22.types.maybeNull(import_mobx_state_tree22.types.string), null),
+  modifiedOn: import_mobx_state_tree22.types.optional(import_mobx_state_tree22.types.maybeNull(import_mobx_state_tree22.types.string), null),
+  isDeleted: import_mobx_state_tree22.types.optional(import_mobx_state_tree22.types.boolean, false)
 }).actions((self) => {
-  const { reqGet, reqPost } = createRequestHelpers(self, import_mobx_state_tree21.getEnv);
+  const { reqGet, reqPost } = createRequestHelpers(self, import_mobx_state_tree22.getEnv);
   return {
     /** GET /CustomField/GetAll?calendar_id= */
     async getAll(calendarId) {
@@ -2999,7 +3173,7 @@ var CustomFieldModel = import_mobx_state_tree21.types.model("CustomField", {
       const body = payload ?? toPayload5(self);
       const res = await reqPost("/CustomField/Add", body);
       if (res.status === "success" && res.data) {
-        (0, import_mobx_state_tree21.applySnapshot)(self, mapCustomFieldFromApi(res.data));
+        (0, import_mobx_state_tree22.applySnapshot)(self, mapCustomFieldFromApi(res.data));
       }
       return res;
     },
@@ -3306,10 +3480,10 @@ var AuthModel = {
 var Auth_default = AuthModel;
 
 // src/models/appointment/index.js
-var import_mobx_state_tree22 = require("mobx-state-tree");
-var RootStore = import_mobx_state_tree22.types.model("RootStore", {
-  calendars: import_mobx_state_tree22.types.optional(import_mobx_state_tree22.types.map(Calendar_default), {}),
-  events: import_mobx_state_tree22.types.optional(import_mobx_state_tree22.types.map(Event_default), {})
+var import_mobx_state_tree23 = require("mobx-state-tree");
+var RootStore = import_mobx_state_tree23.types.model("RootStore", {
+  calendars: import_mobx_state_tree23.types.optional(import_mobx_state_tree23.types.map(Calendar_default), {}),
+  events: import_mobx_state_tree23.types.optional(import_mobx_state_tree23.types.map(Event_default), {})
 }).actions((self) => ({
   addCalendar(snapshot) {
     const cal = Calendar_default.create(snapshot);
@@ -3329,6 +3503,9 @@ function createRootStore(initialState = {}) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  ActivityLogCategory,
+  ActivityLogModel,
+  ActivityLogType,
   AssetModel,
   AssignmentMethod,
   AttendeeStatus,

package/dist/index.mjs

@@ -308,6 +308,14 @@ var CalendarVisibility = {
   Public: 0,
   Private: 1
 };
+var ActivityLogType = {
+  AppointmentScheduled: 9,
+  AppointmentRescheduled: 10,
+  AppointmentCanceled: 11
+};
+var ActivityLogCategory = {
+  Appointments: 3
+};
 
 // src/models/appointment/Event.js
 import { types as types4, getEnv, applySnapshot } from "mobx-state-tree";
@@ -510,7 +518,7 @@ var EventModel = types4.model("Event", {
       };
       return reqPost("/event/update", payload);
     },
-    /** POST /event/reschedule – reschedule event */
+    /** POST /event/reschedule – reschedule event and mark status ReScheduled */
     async reschedule(offsetMinutes) {
       const offset = offsetMinutes ?? getOffset();
       const payload = {
@@ -534,7 +542,12 @@ var EventModel = types4.model("Event", {
         flowPath: self.flowPath ?? void 0
       };
       const res = await reqPost("/event/reschedule", payload, null, { headers: { offset: String(offset) } });
-      if (res.status === "success" && res.data) applySnapshot(self, { ...res.data, eventId: self.eventId });
+      if (res.status !== "success") return res;
+      if (res.data) {
+        applySnapshot(self, { ...mapEventFromApi(res.data), eventId: self.eventId });
+      } else if (self.status !== EventStatus.ReScheduled) {
+        await self.setEventStatus(EventStatus.ReScheduled);
+      }
       return res;
     },
     /** GET /event/cancel – cancel this event */
@@ -828,9 +841,17 @@ EventModel.reschedule = async (payload, offsetMinutes) => {
   const { reqPost } = createRequestHelpersFromEnv(getConfig());
   const offset = offsetMinutes ?? getDefaultOffset();
   const res = await reqPost("/event/reschedule", payload, null, { headers: { offset: String(offset) } });
-  if (res.status === "success" && res.data) {
+  if (res.status !== "success") return null;
+  const eventId = String((payload == null ? void 0 : payload.eventId) ?? (payload == null ? void 0 : payload.EventId) ?? (payload == null ? void 0 : payload.event_id) ?? "");
+  if (res.data) {
     return EventModel.create(mapEventFromApi(res.data), { env: getConfig() });
   }
+  if (eventId) {
+    const statusRes = await EventModel.setEventStatus(eventId, EventStatus.ReScheduled);
+    if (statusRes.status === "success" && statusRes.data) {
+      return EventModel.create(mapEventFromApi(statusRes.data), { env: getConfig() });
+    }
+  }
   return null;
 };
 EventModel.updateEvent = async (payload) => {
@@ -2890,18 +2911,168 @@ LeadModel.getSources = async (companyKey) => {
 };
 var Lead_default = LeadModel;
 
-// src/models/appointment/CustomField.js
-import { types as types21, getEnv as getEnv10, applySnapshot as applySnapshot9 } from "mobx-state-tree";
-var CustomFieldModel = types21.model("CustomField", {
+// src/models/appointment/ActivityLog.js
+import { types as types21 } from "mobx-state-tree";
+var ActivityLogDetailModel = types21.model("ActivityLogDetail", {
+  key: types21.optional(types21.string, ""),
+  value: types21.optional(types21.string, "")
+});
+function mapActivityLogFromApi(d) {
+  if (!d) return d;
+  const pick2 = (...keys) => keys.reduce((v, k) => v ?? d[k], void 0);
+  const detailsRaw = pick2("activityLogDetails", "ActivityLogDetails");
+  const details = Array.isArray(detailsRaw) ? detailsRaw.map((row) => ({
+    key: pickDetail(row, "key", "Key") ?? "",
+    value: pickDetail(row, "value", "Value") ?? ""
+  })) : [];
+  const dataRaw = pick2("data", "Data");
+  const data = dataRaw && typeof dataRaw === "object" && !Array.isArray(dataRaw) ? { ...dataRaw } : details.reduce((acc, row) => {
+    if (row.key) acc[row.key] = row.value ?? "";
+    return acc;
+  }, {});
+  return {
+    id: pick2("id", "Id") ?? null,
+    activityLogId: pick2("activityLogId", "ActivityLogId", "activity_log_id") ?? "new",
+    leadId: pick2("leadId", "LeadId", "lead_id") ?? null,
+    eventId: pick2("eventId", "EventId", "event_id") ?? null,
+    activityTypeId: pick2("activityTypeId", "ActivityTypeId", "activity_type_id") ?? 0,
+    activityTypeName: pick2("activityTypeName", "ActivityTypeName", "activity_type_name") ?? "",
+    categoryId: pick2("categoryId", "CategoryId", "category_id") ?? 3,
+    categoryName: pick2("categoryName", "CategoryName", "category_name") ?? "Appointments",
+    isPartialData: pick2("isPartialData", "IsPartialData", "is_partial_data") ?? false,
+    userEmail: pick2("userEmail", "UserEmail", "user_email") ?? "",
+    createdOn: pick2("createdOn", "CreatedOn", "created_on") ?? null,
+    data,
+    activityLogDetails: details
+  };
+}
+function pickDetail(row, ...keys) {
+  if (!row) return void 0;
+  return keys.reduce((v, k) => v ?? row[k], void 0);
+}
+function normalizeActivityTypeIds(raw) {
+  if (raw == null) return null;
+  const values = Array.isArray(raw) ? raw : [raw];
+  const ids = [];
+  for (const value of values) {
+    if (value == null || value === "") continue;
+    const parts = String(value).split(",");
+    for (const part of parts) {
+      const trimmed = part.trim();
+      if (!trimmed) continue;
+      const n = Number(trimmed);
+      if (Number.isFinite(n)) ids.push(n);
+    }
+  }
+  return ids.length ? ids : null;
+}
+function buildActivityLogQuery(opts = {}) {
+  const companyKey = String(opts.companyKey ?? opts.company_key ?? opts.CompanyKey ?? "").trim();
+  const query = { company_key: companyKey };
+  const leadId = opts.leadId ?? opts.lead_id ?? opts.LeadId;
+  if (leadId != null && String(leadId).trim() !== "") query.lead_id = String(leadId).trim();
+  const eventId = opts.eventId ?? opts.event_id ?? opts.EventId;
+  if (eventId != null && String(eventId).trim() !== "") query.event_id = String(eventId).trim();
+  const userEmail = opts.userEmail ?? opts.user_email ?? opts.UserEmail;
+  if (userEmail != null && String(userEmail).trim() !== "") query.user_email = String(userEmail).trim();
+  const fromDate = opts.fromDate ?? opts.from_date ?? opts.FromDate;
+  if (fromDate != null && String(fromDate).trim() !== "") query.from_date = String(fromDate).trim();
+  const toDate = opts.toDate ?? opts.to_date ?? opts.ToDate;
+  if (toDate != null && String(toDate).trim() !== "") query.to_date = String(toDate).trim();
+  const activityTypeIds = normalizeActivityTypeIds(
+    opts.activityTypeId ?? opts.activity_type_id ?? opts.activityTypeIds ?? opts.activity_type_ids
+  );
+  if (activityTypeIds == null ? void 0 : activityTypeIds.length) {
+    query.activity_type_id = activityTypeIds.length === 1 ? activityTypeIds[0] : activityTypeIds.join(",");
+  }
+  const sortBy = opts.sortBy ?? opts.sort ?? opts.sort_column;
+  if (sortBy != null && sortBy !== "") query.sort = sortBy;
+  const sortOrderRaw = opts.sortOrder ?? opts.sort_dir;
+  if (sortOrderRaw != null && String(sortOrderRaw).trim() !== "") {
+    const u = String(sortOrderRaw).trim().toUpperCase();
+    query.sort_dir = u.startsWith("DESC") ? "desc" : "asc";
+  }
+  const filterPairs = [];
+  const searchColumn = opts.searchColumn ?? opts.search_column ?? opts.column;
+  const searchText = opts.searchText ?? opts.search_text ?? opts.search;
+  const singleColumn = searchColumn != null ? String(searchColumn).trim() : "";
+  const singleText = searchText != null ? String(searchText).trim() : "";
+  if (singleColumn && singleText) filterPairs.push({ column: singleColumn, text: singleText });
+  if (Array.isArray(opts.filters)) {
+    for (const f of opts.filters) {
+      const column = String((f == null ? void 0 : f.column) ?? (f == null ? void 0 : f.searchColumn) ?? (f == null ? void 0 : f.search_column) ?? "").trim();
+      const text = String((f == null ? void 0 : f.text) ?? (f == null ? void 0 : f.searchText) ?? (f == null ? void 0 : f.search_text) ?? (f == null ? void 0 : f.search) ?? "").trim();
+      if (column && text) filterPairs.push({ column, text });
+    }
+  }
+  if (filterPairs.length) {
+    query.search_column = filterPairs.map((f) => f.column);
+    query.search_text = filterPairs.map((f) => f.text);
+  }
+  if (opts.page != null) {
+    query.page = opts.page;
+    if (opts.page_size != null) query.page_size = opts.page_size;
+    else if (opts.pageSize != null) query.page_size = opts.pageSize;
+  } else {
+    if (opts.skip != null) query.skip = opts.skip;
+    if (opts.take != null) query.take = opts.take;
+  }
+  return { companyKey, query };
+}
+var ActivityLogModel = types21.model("ActivityLog", {
   id: types21.optional(types21.maybeNull(types21.number), null),
-  customFieldId: types21.optional(types21.maybeNull(types21.string), null),
-  calendarId: types21.optional(types21.maybeNull(types21.string), null),
-  label: types21.optional(types21.maybeNull(types21.string), null),
-  type: types21.optional(types21.string, ""),
-  isRequired: types21.optional(types21.boolean, false),
+  activityLogId: types21.optional(types21.identifier, "new"),
+  leadId: types21.optional(types21.maybeNull(types21.string), null),
+  eventId: types21.optional(types21.maybeNull(types21.string), null),
+  activityTypeId: types21.optional(types21.number, 0),
+  activityTypeName: types21.optional(types21.string, ""),
+  categoryId: types21.optional(types21.number, 3),
+  categoryName: types21.optional(types21.string, "Appointments"),
+  isPartialData: types21.optional(types21.boolean, false),
+  userEmail: types21.optional(types21.string, ""),
   createdOn: types21.optional(types21.maybeNull(types21.string), null),
-  modifiedOn: types21.optional(types21.maybeNull(types21.string), null),
-  isDeleted: types21.optional(types21.boolean, false)
+  data: types21.optional(types21.frozen(), {}),
+  activityLogDetails: types21.optional(types21.array(ActivityLogDetailModel), [])
+}).actions((self) => ({
+  /** GET /activitylog/get – pass companyKey in opts (required). */
+  async get(opts = {}) {
+    return ActivityLogModel.get(opts);
+  }
+}));
+ActivityLogModel.get = async (opts = {}) => {
+  const { companyKey, query } = buildActivityLogQuery(opts);
+  if (!companyKey) return { status: "failure", message: "companyKey is required" };
+  const { reqGet } = createRequestHelpersFromEnv(getConfig());
+  const res = await reqGet("/activitylog/get", query);
+  if (res.status === "success") {
+    const payload = res.data ?? {};
+    const logsRaw = Array.isArray(payload) ? payload : Array.isArray(payload.ActivityLogs) ? payload.ActivityLogs : Array.isArray(payload.activityLogs) ? payload.activityLogs : null;
+    if (logsRaw) {
+      const activityLogs = logsRaw.map(
+        (row) => ActivityLogModel.create(mapActivityLogFromApi(row), { env: getConfig() })
+      );
+      const totalCountRaw = payload.TotalCount ?? payload.totalCount;
+      const totalCount = Number.isFinite(Number(totalCountRaw)) ? Number(totalCountRaw) : activityLogs.length;
+      return { activityLogs, totalCount };
+    }
+  }
+  return null;
+};
+ActivityLogModel.getByCompany = async (companyKey, opts = {}) => ActivityLogModel.get({ ...opts, companyKey });
+var ActivityLog_default = ActivityLogModel;
+
+// src/models/appointment/CustomField.js
+import { types as types22, getEnv as getEnv10, applySnapshot as applySnapshot9 } from "mobx-state-tree";
+var CustomFieldModel = types22.model("CustomField", {
+  id: types22.optional(types22.maybeNull(types22.number), null),
+  customFieldId: types22.optional(types22.maybeNull(types22.string), null),
+  calendarId: types22.optional(types22.maybeNull(types22.string), null),
+  label: types22.optional(types22.maybeNull(types22.string), null),
+  type: types22.optional(types22.string, ""),
+  isRequired: types22.optional(types22.boolean, false),
+  createdOn: types22.optional(types22.maybeNull(types22.string), null),
+  modifiedOn: types22.optional(types22.maybeNull(types22.string), null),
+  isDeleted: types22.optional(types22.boolean, false)
 }).actions((self) => {
   const { reqGet, reqPost } = createRequestHelpers(self, getEnv10);
   return {
@@ -3231,10 +3402,10 @@ var AuthModel = {
 var Auth_default = AuthModel;
 
 // src/models/appointment/index.js
-import { types as types22, getEnv as getEnv11 } from "mobx-state-tree";
-var RootStore = types22.model("RootStore", {
-  calendars: types22.optional(types22.map(Calendar_default), {}),
-  events: types22.optional(types22.map(Event_default), {})
+import { types as types23, getEnv as getEnv11 } from "mobx-state-tree";
+var RootStore = types23.model("RootStore", {
+  calendars: types23.optional(types23.map(Calendar_default), {}),
+  events: types23.optional(types23.map(Event_default), {})
 }).actions((self) => ({
   addCalendar(snapshot) {
     const cal = Calendar_default.create(snapshot);
@@ -3253,6 +3424,9 @@ function createRootStore(initialState = {}) {
   return RootStore.create(initialState, { env });
 }
 export {
+  ActivityLogCategory,
+  ActivityLog_default as ActivityLogModel,
+  ActivityLogType,
   Asset_default as AssetModel,
   AssignmentMethod,
   AttendeeStatus,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blazeo.com/calendar-client",
-  "version": "1.0.55",
+  "version": "1.0.57",
   "description": "Blazeo Calendar / Appointment API client with MobX State Tree models",
   "exports": {
     ".": {