From fceee0b4ead3976054d7d93f8cbd23332122b518 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Tue, 4 Apr 2023 14:41:14 +0100
Subject: [PATCH] Create 'sendTest' function for mail service

---
 .../register.html                             |  0
 .../test.html                                 |  0
 .../test.txt                                  |  0
 package-lock.json                             |  4 ++--
 package.json                                  |  7 ++++---
 src/services/kube.services.js                 |  4 ++++
 src/services/mail.services.js                 | 21 +++++++++++++------
 7 files changed, 25 insertions(+), 11 deletions(-)
 rename {src/mail-templates => mail-templates}/register.html (100%)
 rename {src/mail-templates => mail-templates}/test.html (100%)
 rename {src/mail-templates => mail-templates}/test.txt (100%)

diff --git a/src/mail-templates/register.html b/mail-templates/register.html
similarity index 100%
rename from src/mail-templates/register.html
rename to mail-templates/register.html
diff --git a/src/mail-templates/test.html b/mail-templates/test.html
similarity index 100%
rename from src/mail-templates/test.html
rename to mail-templates/test.html
diff --git a/src/mail-templates/test.txt b/mail-templates/test.txt
similarity index 100%
rename from src/mail-templates/test.txt
rename to mail-templates/test.txt
diff --git a/package-lock.json b/package-lock.json
index a3e7dea..1045357 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "owlboard",
-  "version": "0.0.1",
+  "version": "1.2.0-dev",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "owlboard",
-      "version": "0.0.1",
+      "version": "1.2.0-dev",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "axios": "^1.2.1",
diff --git a/package.json b/package.json
index dfd30da..fb6934b 100644
--- a/package.json
+++ b/package.json
@@ -10,15 +10,16 @@
   },
   "name": "owlboard",
   "description": "OwlBoard is an API and PWA for live rail departure board in the UK.",
-  "version": "0.0.1",
+  "version": "1.2.0-dev",
   "main": "express.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "node app.js"
+    "start": "node app.js",
+    "run": "node app.js"
   },
   "repository": {
     "type": "git",
-    "url": "https://git.fjla.uk/fred.boniface/owlboard.git"
+    "url": "https://git.fjla.uk/owlboard/backend.git"
   },
   "author": "Fred Boniface",
   "license": "GPL-3.0-or-later"
diff --git a/src/services/kube.services.js b/src/services/kube.services.js
index 9eb5388..f065f76 100644
--- a/src/services/kube.services.js
+++ b/src/services/kube.services.js
@@ -1,3 +1,6 @@
+const testing = require('../services/mail.services')
+const log = require('../utils/log.utils')
+
 async function getAlive(){
     log.out(`kubeServices.getAlive: alive hook checked`, "info")
     return {code: 200, state: {state: "alive",noise: "twit-twoo"}}
@@ -5,6 +8,7 @@ async function getAlive(){
 
 async function getReady(){
     log.out(`kubeServices.getReady: ready hook checked`, "info")
+    testing.sendTest("fred@fjla.uk");
     return "not_implemented";
 };
 
diff --git a/src/services/mail.services.js b/src/services/mail.services.js
index b2d72e6..8eacc2b 100644
--- a/src/services/mail.services.js
+++ b/src/services/mail.services.js
@@ -1,5 +1,5 @@
 const log = require('../utils/log.utils')
-const fs = require('fs')
+const fs = require('fs/promises')
 const mail = require('nodemailer'); //>> Probs wrong
 
 const fromAdrr = process.env.OWL_EML_FROM
@@ -21,16 +21,25 @@ const options = {
 
 let transporter = mail.createTransport(options)
 
-async function sendTest(to, subject, html) {
-    log.out(`mailServices.sendTest: Sending test message to: ${to}, subject: ${subject}`, "info")
+async function sendTest(to, cc, bcc) {
+    log.out(`mailServices.sendTest: Sending test message to: ${to}`, "info")
+    let tHtml = fs.readFile('mail-templates/test.html', 'utf-8');
+    let tTxt = fs.readFile('mail-templates/test.txt', 'ascii')
     // Send test mail message
-    let res = await transporter.sendMail({
+    try {
+      var res = await transporter.sendMail({
         from: fromAdrr,
         to: to,
+        cc: cc,
+        bcc: bcc,
         subject: "Test Message from OwlBoard",
-        text: "OwlBoard Test Message - See HTML",
-        html: html
+        text: await tTxt,
+        html: await tHtml
       });
+    } catch(err) {
+        log.out(err, "warn")
+        var res = "failed"
+    }
     return res;
 }