@blazeo.com/calendar-client 1.0.11 → 1.0.13

package/dist/index.js

@@ -551,16 +551,25 @@ EventModel.getByVisitorPhone = async (phone, opts = {}) => {
   }
   return null;
 };
-EventModel.getByDateRangeWithFilters = async (startDateFrom, startDateTo, opts = {}) => {
+async function getByFiltersInternal(path, companyKey, opts = {}, dateRange = null) {
+  if (companyKey == null || String(companyKey).trim() === "") {
+    throw new Error("companyKey required");
+  }
   const { reqGet } = createRequestHelpersFromEnv(getConfig());
   const query = {
-    start_date_from: startDateFrom,
-    start_date_to: startDateTo
+    company_key: String(companyKey).trim()
   };
+  if (dateRange) {
+    if (dateRange.startDateFrom == null || dateRange.startDateTo == null) {
+      throw new Error("startDateFrom and startDateTo required");
+    }
+    query.start_date_from = dateRange.startDateFrom;
+    query.start_date_to = dateRange.startDateTo;
+  }
   const offset = opts.offset ?? getDefaultOffset();
-  if (opts.companyKey != null && opts.companyKey !== "") query.company_key = opts.companyKey;
   if (opts.calendarId != null && opts.calendarId !== "") query.calendar_id = opts.calendarId;
   if (opts.participantId != null && opts.participantId !== "") query.participant_id = opts.participantId;
+  if (opts.leadId != null && opts.leadId !== "") query.lead_id = opts.leadId;
   if (opts.visitorName != null && opts.visitorName !== "") query.visitor_name = opts.visitorName;
   if (opts.visitorEmail != null && opts.visitorEmail !== "") query.visitor_email = opts.visitorEmail;
   if (opts.visitorPhone != null && opts.visitorPhone !== "") query.visitor_phone = opts.visitorPhone;
@@ -582,7 +591,7 @@ EventModel.getByDateRangeWithFilters = async (startDateFrom, startDateTo, opts =
     if (opts.skip != null) query.skip = opts.skip;
     if (opts.take != null) query.take = opts.take;
   }
-  const res = await reqGet("/event/search/daterange/get", query, { headers: { offset: String(offset) } });
+  const res = await reqGet(path, query, { headers: { offset: String(offset) } });
   if (res.status !== "success") {
     return { events: [], totalCount: 0 };
   }
@@ -592,7 +601,9 @@ EventModel.getByDateRangeWithFilters = async (startDateFrom, startDateTo, opts =
   const totalCount = Number.isFinite(Number(totalCountRaw)) ? Number(totalCountRaw) : eventsRaw.length;
   const events = eventsRaw.map((e) => EventModel.create(mapEventFromApi(e), { env: getConfig() }));
   return { events, totalCount };
-};
+}
+EventModel.getByDateRangeWithFilters = async (companyKey, startDateFrom, startDateTo, opts = {}) => getByFiltersInternal("/event/search/daterange/get", companyKey, opts, { startDateFrom, startDateTo });
+EventModel.getByFilters = async (companyKey, opts = {}) => getByFiltersInternal("/event/search/get", companyKey, opts);
 EventModel.getAvailability = async (calendarId, year, month, day, opts = {}) => {
   const { req } = createRequestHelpersFromEnv(getConfig());
   const query = { calendar_id: calendarId, year, month, day };

package/dist/index.mjs

@@ -498,16 +498,25 @@ EventModel.getByVisitorPhone = async (phone, opts = {}) => {
   }
   return null;
 };
-EventModel.getByDateRangeWithFilters = async (startDateFrom, startDateTo, opts = {}) => {
+async function getByFiltersInternal(path, companyKey, opts = {}, dateRange = null) {
+  if (companyKey == null || String(companyKey).trim() === "") {
+    throw new Error("companyKey required");
+  }
   const { reqGet } = createRequestHelpersFromEnv(getConfig());
   const query = {
-    start_date_from: startDateFrom,
-    start_date_to: startDateTo
+    company_key: String(companyKey).trim()
   };
+  if (dateRange) {
+    if (dateRange.startDateFrom == null || dateRange.startDateTo == null) {
+      throw new Error("startDateFrom and startDateTo required");
+    }
+    query.start_date_from = dateRange.startDateFrom;
+    query.start_date_to = dateRange.startDateTo;
+  }
   const offset = opts.offset ?? getDefaultOffset();
-  if (opts.companyKey != null && opts.companyKey !== "") query.company_key = opts.companyKey;
   if (opts.calendarId != null && opts.calendarId !== "") query.calendar_id = opts.calendarId;
   if (opts.participantId != null && opts.participantId !== "") query.participant_id = opts.participantId;
+  if (opts.leadId != null && opts.leadId !== "") query.lead_id = opts.leadId;
   if (opts.visitorName != null && opts.visitorName !== "") query.visitor_name = opts.visitorName;
   if (opts.visitorEmail != null && opts.visitorEmail !== "") query.visitor_email = opts.visitorEmail;
   if (opts.visitorPhone != null && opts.visitorPhone !== "") query.visitor_phone = opts.visitorPhone;
@@ -529,7 +538,7 @@ EventModel.getByDateRangeWithFilters = async (startDateFrom, startDateTo, opts =
     if (opts.skip != null) query.skip = opts.skip;
     if (opts.take != null) query.take = opts.take;
   }
-  const res = await reqGet("/event/search/daterange/get", query, { headers: { offset: String(offset) } });
+  const res = await reqGet(path, query, { headers: { offset: String(offset) } });
   if (res.status !== "success") {
     return { events: [], totalCount: 0 };
   }
@@ -539,7 +548,9 @@ EventModel.getByDateRangeWithFilters = async (startDateFrom, startDateTo, opts =
   const totalCount = Number.isFinite(Number(totalCountRaw)) ? Number(totalCountRaw) : eventsRaw.length;
   const events = eventsRaw.map((e) => EventModel.create(mapEventFromApi(e), { env: getConfig() }));
   return { events, totalCount };
-};
+}
+EventModel.getByDateRangeWithFilters = async (companyKey, startDateFrom, startDateTo, opts = {}) => getByFiltersInternal("/event/search/daterange/get", companyKey, opts, { startDateFrom, startDateTo });
+EventModel.getByFilters = async (companyKey, opts = {}) => getByFiltersInternal("/event/search/get", companyKey, opts);
 EventModel.getAvailability = async (calendarId, year, month, day, opts = {}) => {
   const { req } = createRequestHelpersFromEnv(getConfig());
   const query = { calendar_id: calendarId, year, month, day };

package/package.json

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