added triton notification service, to test on qc

c3g · Jul 26, 2024 · 9ceffab · 9ceffab
1 parent 1149b75
commit 9ceffab
Show file tree

Hide file tree

Showing 7 changed files with 103 additions and 61 deletions.
diff --git a/triton-server/package-lock.json b/triton-server/package-lock.json
diff --git a/triton-server/package.json b/triton-server/package.json
@@ -49,6 +49,7 @@
         "kysely": "^0.26.3",
         "memorystore": "^1.6.7",
         "node-cron": "^3.0.3",
+        "nodemailer": "^6.9.14",
         "pino": "^8.14.1",
         "serve-favicon": "^2.5.0",
         "sqlite3": "^5.1.7"
@@ -64,6 +65,7 @@
         "@types/express-session": "^1.17.5",
         "@types/node": "^18.7.11",
         "@types/node-cron": "^3.0.11",
+        "@types/nodemailer": "^6.4.15",
         "@types/serve-favicon": "^2.5.3",
         "@types/sqlite3": "^3.1.8",
         "globals": "^15.6.0",

diff --git a/triton-server/src/api/datasets.ts b/triton-server/src/api/datasets.ts
@@ -9,13 +9,13 @@ import {
 } from "./api-types"
 
 export async function listRunsByExternalProjectId(
-    externalProjectIds: string[],
+    externalProjectIds: string[]
 ): Promise<TritonRun[]> {
     const freezemanApi = await getFreezeManAuthenticatedAPI()
     const datasetsResponse =
         await freezemanApi.Dataset.listByExternalProjectIds(externalProjectIds)
     const datasets = datasetsResponse.data.results.filter(
-        (dataset) => dataset.released_status_count > 0,
+        (dataset) => dataset.released_status_count > 0
     )
     const datasetsByRunIDAndProjectID = datasets.reduce<{
         [projectID: string]: { [runName: string]: typeof datasets }
@@ -41,11 +41,11 @@ export async function listRunsByExternalProjectId(
                 datasets: datasets.map((d) => d.id),
                 readsetCount: datasets.reduce(
                     (total, d) => total + d.readset_count,
-                    0,
+                    0
                 ),
                 availableReadsetsCount: datasets.reduce(
                     (total, d) => total + d.released_status_count,
-                    0,
+                    0
                 ),
             })
         }
@@ -55,7 +55,7 @@ export async function listRunsByExternalProjectId(
 }
 
 export async function listDatasetsByIds(
-    datasetIds: string[],
+    datasetIds: string[]
 ): Promise<TritonDataset[]> {
     const freezemanApi = await getFreezeManAuthenticatedAPI()
     const datasetsResponse = await freezemanApi.Dataset.list(datasetIds)
@@ -64,15 +64,15 @@ export async function listDatasetsByIds(
 }
 
 export async function listRequests(
-    datasetIds: Array<TritonDataset["id"]>,
+    datasetIds: Array<TritonDataset["id"]>
 ): Promise<TritonRequest[]> {
     const { listRequestByDatasetId } = await defaultDatabaseActions()
     return (
         await Promise.all(
             datasetIds.map(
                 async (datasetId) =>
-                    await listRequestByDatasetId(datasetId.toString()),
-            ),
+                    await listRequestByDatasetId(datasetId.toString())
+            )
         )
     ).reduce<TritonRequest[]>((requests, request) => {
         if (request) {
@@ -83,17 +83,18 @@ export async function listRequests(
 }
 
 export async function listReadsetsByDataset(
-    datasetId: TritonDataset["id"],
+    datasetId: TritonDataset["id"]
 ): Promise<TritonReadset[]> {
     const freezemanApi = await getFreezeManAuthenticatedAPI()
-    const readsetsResponse =
-        await freezemanApi.Readset.listByDatasetId(datasetId)
+    const readsetsResponse = await freezemanApi.Readset.listByDatasetId(
+        datasetId
+    )
     const readsets = [...readsetsResponse.data.results] // it's a readonly array
     return readsets
 }
 
 export async function listDatasetFilesByDataset(
-    datasetId: TritonDataset["id"],
+    datasetId: TritonDataset["id"]
 ): Promise<TritonDatasetFile[]> {
     const freezemanApi = await getFreezeManAuthenticatedAPI()
     const readsets = (
@@ -134,6 +135,6 @@ export async function listDatasetFilesByDataset(
             }
             return tritonDatasetFiles
         },
-        [],
+        []
     )
 }
diff --git a/triton-server/src/api/project.ts b/triton-server/src/api/project.ts
@@ -16,7 +16,7 @@ import { TritonProject } from "./api-types"
  */
 export async function listUserProjects(
     userId: string,
-    userToken: string,
+    userToken: string
 ): Promise<TritonProject[]> {
     const magicProjects = await getUserProjects(userId, userToken)
 

diff --git a/triton-server/src/contact-service.ts b/triton-server/src/contact-service.ts
@@ -38,9 +38,9 @@ export function start() {
                             async (send) => {
                                 await send(
                                     getCredentialSubjectFor(contact),
-                                    getCredentialMessageFor(contact),
+                                    getCredentialMessageFor(contact)
                                 )
-                            },
+                            }
                         )
 
                         logger.info(`[contacts] Removing contact ${contact.id}`)
@@ -49,19 +49,19 @@ export function start() {
                             .catch((error) =>
                                 logger.error(
                                     error,
-                                    `[contacts] Could not remove contact ${contact.id}`,
-                                ),
+                                    `[contacts] Could not remove contact ${contact.id}`
+                                )
                             )
                     }
-                }),
+                })
         )
 
         const requests = await db.listRequests()
         logger.debug(`[contacts] Found ${requests.length} requests`)
         await Promise.allSettled(
             requests.map(async (request) => {
                 logger.debug(
-                    `[contacts] Processing request: ${JSON.stringify(request)}`,
+                    `[contacts] Processing request: ${JSON.stringify(request)}`
                 )
                 const completionDate =
                     request.completion_date && new Date(request.completion_date)
@@ -83,9 +83,9 @@ export function start() {
                             await send(
                                 `${subject}`,
                                 `${subject}.<br/>
-                        The dataset can be downloaded using ${request.type} using the credential provided to you.`,
+                        The dataset can be downloaded using ${request.type} using the credential provided to you.`
                             )
-                        },
+                        }
                     )
                     await db.updateNotificationDate(request.id)
                 }
@@ -99,11 +99,11 @@ export function start() {
                         request.project_id,
                         async (send) => {
                             await send(`${subject}`, `${subject}.`)
-                        },
+                        }
                     )
                     await db.updateNotificationDate(request.id)
                 }
-            }),
+            })
         )
     }
 
@@ -113,8 +113,8 @@ export function start() {
 export async function broadcastEmailsOfProject(
     projectID: string,
     fn: (
-        sendEmail: (subject: string, message: string) => Promise<void>,
-    ) => Promise<void>,
+        sendEmail: (subject: string, message: string) => Promise<void>
+    ) => Promise<void>
 ) {
     const emails = await getEmailsForProject(projectID)
 
@@ -124,9 +124,9 @@ export async function broadcastEmailsOfProject(
                 logger.info(`[contacts] Sending email to ${to}`)
                 await sendEmail("", to, subject, message)
             }).catch((error) =>
-                logger.error(error, `[contacts] Could not send email to ${to}`),
+                logger.error(error, `[contacts] Could not send email to ${to}`)
             )
-        }),
+        })
     )
 }
 
@@ -205,7 +205,7 @@ function getCredentialMessageFor(contact: Contact) {
 }
 
 async function getEmailsForProject(
-    projectID: ExternalProjectID,
+    projectID: ExternalProjectID
 ): Promise<string[]> {
     try {
         const { users } = await getProjectUsers(projectID)
@@ -221,12 +221,12 @@ async function getEmailsForProject(
             "",
             config.mail.errorMonitoring,
             subject,
-            `ProjectID: ${projectID}<br/><pre>${stack}</pre>`,
+            `ProjectID: ${projectID}<br/><pre>${stack}</pre>`
         ).catch((error) =>
             logger.error(
                 error,
-                `[contacts] Could not send email to ${config.mail.errorMonitoring}`,
-            ),
+                `[contacts] Could not send email to ${config.mail.errorMonitoring}`
+            )
         )
     }