@openinc/parse-server-opendash 2.4.80 → 2.4.81

package/dist/functions/openinc-openservice-ticket-data.js

@@ -76,7 +76,7 @@ async function handleRequest(request) {
     }
 }
 async function getTicketData(tickets) {
-    const ticketIds = tickets.map((ticket) => ticket.id);
+    // const ticketIds = tickets.map((ticket) => ticket.id);
     // get assigned users and roles
     console.log("fetching assigned users and roles");
     const ticketDataPromises = tickets.map(async (ticket) => {
@@ -92,137 +92,229 @@ async function getTicketData(tickets) {
                 .query()
                 .find({ useMasterKey: true });
         }
+        const downtimes = await getDowntime(ticket);
+        const duedate = await getDueDate(ticket);
+        const frequency = await getFrequency(ticket);
+        const restriction = await getRestriction(ticket);
+        const issuecategory = await getIssueCategory(ticket);
+        const priority = await getPriority(ticket);
+        const source = await getTicketSource(ticket);
+        const state = await getState(ticket);
+        const dailySchedule = await getDailySchedule(ticket);
+        const messages = await getMessages(ticket);
         return {
             ticket: ticket,
+            downtime: downtimes.length > 0 ? downtimes[0] : undefined,
+            duedate: duedate.length > 0 ? duedate[0] : undefined,
+            issuecategory: issuecategory.length > 0
+                ? issuecategory[0]?.get("issuecategory")
+                : undefined,
+            frequency: frequency.length > 0 ? frequency[0] : undefined,
+            restriction: restriction.length > 0 ? restriction[0] : undefined,
+            priority: priority.length > 0 ? priority[0] : undefined,
+            source: source.length > 0 ? source[0]?.get("source") : undefined,
+            state: state.length > 0 ? state[0]?.get("state") : undefined,
+            messages: messages.messages,
+            messageBodies: messages.messageBodies,
+            dailySchedule: dailySchedule,
             assignedTo: [...assignedusers, ...assignedroles],
         };
     });
-    const ticketData = await Promise.all(ticketDataPromises);
-    // fetch daily schedule
-    console.log("fetching daily schedule");
-    const schedules = await new Parse.Query(types_1.Maintenance_DailySchedule)
-        .include("tickets")
-        .matchesQuery("tickets", new Parse.Query(types_1.Maintenance_DailySchedule).matchesQuery("tickets", new Parse.Query(types_1.Maintenance_Ticket).containedIn("objectId", ticketIds)))
-        .limit(1000000)
-        .find({ useMasterKey: true });
-    const scheduleTickets = await Promise.all(schedules.map(async (schedule) => {
-        return {
-            schedule,
-            tickets: await schedule
-                .get("tickets")
-                .query()
-                .find({ useMasterKey: true }),
-        };
-    }));
-    ticketData.forEach((data) => {
-        const scheduleTicket = scheduleTickets.find((scheduleTicket) => scheduleTicket.tickets.some((ticket) => ticket.id === data.ticket.id));
-        if (scheduleTicket) {
-            data.dailySchedule = scheduleTicket.schedule;
-        }
-    });
-    // fetch downtime
+    return await Promise.all(ticketDataPromises);
+}
+/**
+ * Fetches the downtime for a ticket
+ * @param ticket
+ * @param ticketIds
+ * @returns
+ */
+async function getDowntime(ticket) {
     console.log("fetching downtime");
-    const downtimes = await new Parse.Query(types_1.Maintenance_Downtime)
+    return await new Parse.Query(types_1.Maintenance_Downtime)
         .descending("updatedAt")
-        .containedIn("ticket", ticketIds)
+        .equalTo("ticket", ticket)
+        // .containedIn("ticket", ticketIds)
         .limit(1000000)
         .find({ useMasterKey: true });
-    ticketData.forEach((data) => {
-        data.downtime = downtimes.find((downtime) => downtime.get("ticket").id === data.ticket.id);
-    });
-    // fetch duedate
+    // .filter((downtime) => downtime.get("ticket").id === ticket.id, {
+    //   useMasterKey: true,
+    // });
+}
+/**
+ * Fetches the duedate for a ticket
+ * @param ticket
+ * @param ticketIds
+ * @returns
+ */
+async function getDueDate(ticket) {
     console.log("fetching duedate");
-    const duedates = await new Parse.Query(types_1.Maintenance_Duedate)
+    return await new Parse.Query(types_1.Maintenance_Duedate)
         .descending("updatedAt")
-        .containedIn("ticket", ticketIds)
+        .equalTo("ticket", ticket)
+        // .containedIn("ticket", ticketIds)
         .limit(1000000)
         .find({ useMasterKey: true });
-    ticketData.forEach((data) => {
-        data.duedate = duedates.find((duedate) => duedate.get("ticket").id === data.ticket.id);
-    });
-    // fetch frequency
+    // .filter((duedate) => duedate.get("ticket").id === ticket.id, {
+    //   useMasterKey: true,
+    // });
+}
+/**
+ * Fetches the frequency for a ticket
+ * @param ticket
+ * @param ticketIds
+ */
+async function getFrequency(ticket) {
     console.log("fetching frequency");
-    const frequencies = await new Parse.Query(types_1.Maintenance_Frequency)
+    return await new Parse.Query(types_1.Maintenance_Frequency)
         .descending("updatedAt")
-        .containedIn("ticket", ticketIds)
+        .equalTo("ticket", ticket)
+        // .containedIn("ticket", ticketIds)
         .limit(1000000)
         .find({ useMasterKey: true });
-    ticketData.forEach((data) => {
-        data.frequency = frequencies.find((frequency) => frequency.get("ticket").id === data.ticket.id);
-    });
-    // fetch issuecategory
-    console.log("fetching issuecategory");
-    const issuecategories = await new Parse.Query(types_1.Maintenance_Ticket_Issuecategory)
-        .includeAll()
+    // .filter((frequency) => frequency.get("ticket").id === ticket.id, {
+    //   useMasterKey: true,
+    // });
+}
+/**
+ * Fetches the restriction for a ticket
+ * @param ticket
+ * @param ticketIds
+ */
+async function getRestriction(ticket) {
+    console.log("fetching restriction");
+    return await new Parse.Query(types_1.Maintenance_Restriction)
         .descending("updatedAt")
-        .containedIn("ticket", ticketIds)
+        .equalTo("ticket", ticket)
+        // .containedIn("ticket", ticketIds)
         .limit(1000000)
         .find({ useMasterKey: true });
-    ticketData.forEach((data) => {
-        data.issuecategory = issuecategories
-            .find((issuecategory) => issuecategory.get("ticket").id === data.ticket.id)
-            ?.get("issuecategory");
-    });
-    // fetch state
+    // .filter((restriction) => restriction.get("ticket").id === ticket.id, {
+    //   useMasterKey: true,
+    // });
+}
+/**
+ * Fetches the priority for a ticket
+ * @param ticket
+ * @param ticketIds
+ * @returns
+ */
+async function getPriority(ticket) {
+    console.log("fetching priority");
+    return await new Parse.Query(types_1.Maintenance_Priority)
+        .descending("updatedAt")
+        .equalTo("ticket", ticket)
+        // .containedIn("ticket", ticketIds)
+        .limit(1000000)
+        .equalTo("ticket", ticket)
+        .find({ useMasterKey: true });
+    // .filter((priority) => priority.get("ticket").id === ticket.id, {
+    //   useMasterKey: true,
+    // });
+}
+/**
+ * Fetches the state for a ticket
+ * @param ticket
+ * @param ticketIds
+ */
+async function getState(ticket) {
     console.log("fetching state");
-    const ticketStates = await new Parse.Query(types_1.Maintenance_Ticket_Kanban_State_Current)
+    return await new Parse.Query(types_1.Maintenance_Ticket_Kanban_State_Current)
         .descending("updatedAt")
         .includeAll()
-        .matchesQuery("ticket", new Parse.Query(types_1.Maintenance_Ticket).containedIn("objectId", ticketIds))
+        .matchesQuery("ticket", new Parse.Query(types_1.Maintenance_Ticket).equalTo("objectId", ticket.id)
+    // .containedIn("objectId", ticketIds)
+    )
         .limit(1000000)
         .find({ useMasterKey: true });
-    ticketData.forEach((data) => {
-        data.state = ticketStates.find((ts) => ts.get("ticket")?.id === data.ticket.id)?.state;
-    });
-    // fetch messages
+    // .filter((ts) => ts.get("ticket")?.id === ticket.id, {
+    //   useMasterKey: true,
+    // });
+}
+/**
+ * Fetches the messages for a ticket
+ * @param ticket
+ * @param ticketIds
+ */
+async function getMessages(ticket) {
     console.log("fetching messages");
     const messageBodies = await new Parse.Query(types_1.Maintenance_Message_Body)
         .include("message")
         .matchesQuery("message", new Parse.Query(types_1.Maintenance_Message)
         .descending("updatedAt")
-        .containedIn("referencedObjectId", ticketIds)
+        .equalTo("referencedObjectId", ticket.id)
+        // .containedIn("referencedObjectId", ticketIds)
         .limit(1000000))
         .limit(1000000)
         .find({ useMasterKey: true });
     const messages = messageBodies
         .map((msgB) => msgB.message)
         .filter((msg) => !!msg);
-    ticketData.forEach((data) => {
-        data.messages = messages.filter((msg) => msg?.get("referencedObjectId") === data.ticket.id);
-        data.messageBodies = messageBodies.filter((msgB) => data.messages?.some((msg) => msg.id === msgB.get("message")?.id));
-    });
-    // fetch priority
-    console.log("fetching priority");
-    const priorities = await new Parse.Query(types_1.Maintenance_Priority)
-        .descending("updatedAt")
-        .containedIn("ticket", ticketIds)
-        .limit(1000000)
-        .find({ useMasterKey: true });
-    ticketData.forEach((data) => {
-        data.priority = priorities.find((priority) => priority.get("ticket").id === data.ticket.id);
-    });
-    // fetch restriction
-    console.log("fetching restriction");
-    const restrictions = await new Parse.Query(types_1.Maintenance_Restriction)
+    return {
+        messages: messages.filter((msg) => msg?.get("referencedObjectId") === ticket.id),
+        messageBodies: messageBodies.filter((msgB) => messages?.some((msg) => msg.id === msgB.get("message")?.id)),
+    };
+}
+/**
+ * Fetches the issuecategory for a ticket
+ * @param ticket
+ * @param ticketIds
+ * @returns
+ */
+async function getIssueCategory(ticket) {
+    console.log("fetching issuecategory");
+    return await new Parse.Query(types_1.Maintenance_Ticket_Issuecategory)
+        .includeAll()
         .descending("updatedAt")
-        .containedIn("ticket", ticketIds)
+        .equalTo("ticket", ticket)
+        // .containedIn("ticket", ticketIds)
         .limit(1000000)
         .find({ useMasterKey: true });
-    ticketData.forEach((data) => {
-        data.restriction = restrictions.find((restriction) => restriction.get("ticket").id === data.ticket.id);
-    });
-    // fetch source
+    // .filter((issuecategory) => issuecategory.get("ticket").id === ticket.id, {
+    //   useMasterKey: true,
+    // });
+}
+/**
+ * Fetches the source for a ticket
+ * @param ticket
+ * @param ticketIds
+ */
+async function getTicketSource(ticket) {
     console.log("fetching source");
-    const sources = await new Parse.Query(types_1.Maintenance_Ticket_Source)
+    return await new Parse.Query(types_1.Maintenance_Ticket_Source)
         .includeAll()
         .descending("updatedAt")
-        .containedIn("ticket", ticketIds)
+        .equalTo("ticket", ticket)
+        // .containedIn("ticket", ticketIds)
         .limit(1000000)
         .find({ useMasterKey: true });
-    ticketData.forEach((data) => {
-        data.source = sources.find((source) => source.get("ticket").id === data.ticket.id)?.source;
-    });
-    return ticketData;
+    // .filter((source) => source.get("ticket").id === ticket.id, {
+    //   useMasterKey: true,
+    // });
+}
+/**
+ * Fetches the daily schedule for a ticket
+ * @param ticket
+ * @param ticketIds
+ */
+async function getDailySchedule(ticket) {
+    console.log("fetching daily schedule");
+    const schedules = await new Parse.Query(types_1.Maintenance_DailySchedule)
+        .include("tickets")
+        .matchesQuery("tickets", new Parse.Query(types_1.Maintenance_DailySchedule).matchesQuery("tickets", new Parse.Query(types_1.Maintenance_Ticket).equalTo("objectId", ticket.id)
+    // .containedIn("objectId", ticketIds)
+    ))
+        .limit(1000000)
+        .find({ useMasterKey: true });
+    const scheduleTickets = await Promise.all(schedules.map(async (schedule) => {
+        return {
+            schedule,
+            tickets: await schedule
+                .get("tickets")
+                .query()
+                .find({ useMasterKey: true }),
+        };
+    }));
+    return scheduleTickets.find((scheduleTicket) => scheduleTicket.tickets.some((ticket) => ticket.id === ticket.id))?.schedule;
 }
 /**
  * Used to filter tickets based on the filterBy attribute
@@ -243,11 +335,6 @@ const filterQueryMap = {
             .includeAll()
             .find({ useMasterKey: true });
         const filteredTicketSources = arrayToDistinct(allTicketSources, (ts) => ts.get("ticket").id, (ts) => ts.get("source").id === value);
-        console.log("filtered Array", filteredTicketSources.map((ts) => ts.get("ticket").title +
-            " - " +
-            ts.get("source").name +
-            " - " +
-            ts.get("source").id));
         // @ts-ignore
         query.containedIn("objectId", filteredTicketSources.map((ts) => ts.get("ticket").id));
     },
@@ -285,11 +372,6 @@ const filterQueryMap = {
  * @returns an array with distinct values based on the getId function
  */
 function arrayToDistinct(arr, getId, filter) {
-    console.log("Whole Array", arr.map((ts) => ts.get("ticket").title +
-        " - " +
-        ts.get("source").name +
-        " - " +
-        ts.get("source").id));
     const map = new Map();
     arr.forEach((item) => {
         if (map.has(getId(item)))
@@ -297,11 +379,6 @@ function arrayToDistinct(arr, getId, filter) {
         map.set(getId(item), item);
     });
     const array = Array.from(map.values());
-    console.log("Distinct Array", array.map((ts) => ts.get("ticket").title +
-        " - " +
-        ts.get("source").name +
-        " - " +
-        ts.get("source").id));
     return filter ? array.filter(filter) : array;
 }
 function findSortByValue(sortBy, obj) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openinc/parse-server-opendash",
-  "version": "2.4.80",
+  "version": "2.4.81",
   "description": "Parse Server Cloud Code for open.DASH",
   "keywords": [
     "parse",