prepare deployment

prepare deployment

__test/gitlab.test.ts

+const gitlab = require('../functions/gitlab')
+
+describe('GitLab API', () => {
+    test('get all projects', async () => {
+        let projects = await gitlab.getProjects(10, 0)
+        expect(projects).not.toBeNull()
+    })
+    test('get latest pipeline status of a project', async () => {
+        let status = await gitlab.getLatestPipelineStatus(81)
+        expect(status).not.toBeNull()
+    })
+})
\ No newline at end of file

__test/methods.test.ts

+const methods = require('../functions/methods')
+
+describe('DB methods', () => {
+    test('all mailinglists', async () => {
+        let lists = await methods.getAllMailinglists(0)
+        expect(lists).not.toBeNull()
+    })
+    test('project overview', async () => {
+        let overview = await methods.getProjectOverviewById(81)
+        expect(overview).not.toBeNull()
+    })
+    test('project images', async () => {
+        let images = await methods.getProjectImagesById(81)
+        expect(images).not.toBeNull()
+    })
+})
\ No newline at end of file

config/config.ts

@@ -4,16 +4,8 @@ module.exports = {
       name: 'Project Page Manager',
       port: process.env.PORT || 8888
     },
-    passport: {
-      strategy: 'saml',
-      saml: {
-        path: process.env.SAML_PATH || '/saml/SSO',
-        entryPoint: process.env.SAML_ENTRY_POINT || 'saml entry URL',
-        issuer: 'saml issuer URL',
-        logoutUrl: 'saml Logout URL'
-      }
-    },
     database: {
+      host: 'localhost',
       user: 'usernamedb',          // DB username
       password: 'passworddb',  // DB password
       port: 3306,                 // MySQL port
@@ -21,15 +13,6 @@ module.exports = {
       host_project: 'localhost', // local
       dbProject: 'projectdb'     // Project DB
     },
-    mailer: {
-      host: 'mailhost',  // hostname
-      secureConnection: false,        // TLS requires secureConnection to be false
-      port: 587,                      // port for secure SMTP
-      authUser: 'usernamemail',
-      authPass: 'passwordmail',
-      tlsCiphers: 'SSLv3',
-      from: 'email_from',
-    },
     gitlab: {
       token_readWriteProjects: 'putyourtokenhere'
     }
@@ -39,16 +22,8 @@ module.exports = {
       name: 'Project Page Manager',
       port: process.env.PORT || 8888
     },
-    passport: {
-      strategy: 'saml',
-      saml: {
-        path: process.env.SAML_PATH || '/saml/SSO',
-        entryPoint: process.env.SAML_ENTRY_POINT || 'saml entry URL',
-        issuer: 'saml issuer URL',
-        logoutUrl: 'saml Logout URL'
-      }
-    },
     database: {
+      host: 'localhost',
       user: 'usernamedb',          // DB username
       password: 'passworddb',  // DB password
       port: 3306,                 // MySQL port
@@ -56,15 +31,6 @@ module.exports = {
       host_project: 'localhost', // local
       dbProject: 'projectdb'     // Project DB
     },
-    mailer: {
-      host: 'mailhost',  // hostname
-      secureConnection: false,        // TLS requires secureConnection to be false
-      port: 587,                      // port for secure SMTP
-      authUser: 'usernamemail',
-      authPass: 'passwordmail',
-      tlsCiphers: 'SSLv3',
-      from: 'email_from',
-    },
     gitlab: {
       token_readWriteProjects: 'putyourtokenhere'
     }

config/dbconn.ts

-const mysql = require('mysql')
+import mysql from 'mysql2'
 
 var env = process.env.NODE_ENV || 'testing';
-const config = require('../config/config')[env]
+const config = require('./config')[env]
 
 // ==== USER ACOOUNT DB CONNECTION ====
-var userConnection = mysql.createConnection({
+const userConnection = mysql.createPool({
     host: config.database.host,
     user: config.database.user,
     password: config.database.password,
     port: config.database.port,
     database: config.database.dbUser,
-    multipleStatements: true
+    waitForConnections: true,
+    connectionLimit: 10,
+    queueLimit: 0
 })
 
-userConnection.connect(function(err) {
-    if (err) throw err;
-})
 userConnection.query('USE '+config.database.dbUser)
-    
-// user db connection test
-userConnection.query('SELECT 1 + 5 AS solution', function (err, rows, fields) {
-    if (err) throw err
-    console.log('Solution = ', rows[0].solution)
-})
-//userConnection.end()
 
 // ==== PROJECT DB CONNECTION ====
-var projectConnection = mysql.createConnection({
+const projectConnection = mysql.createPool({
     host: config.database.host_project,
     user: config.database.user,
     password: config.database.password,
     port: config.database.port,
-    database: config.database.dbProject
+    database: config.database.dbProject,
+    waitForConnections: true,
+    connectionLimit: 10,
+    queueLimit: 0
 })
 
-projectConnection.connect(function(err) {
-    if (err) throw err;
-})
 projectConnection.query('USE '+config.database.dbProject)
-    
-// projectdb connection test
-projectConnection.query('SELECT 10 + 5 AS project', function (err, rows, fields) {
-    if (err) throw err
-    console.log('Project = ', rows[0].project)
-})
-//projectConnection.end()
 
-var connection = {
+const connection = {
     user: userConnection,
     project: projectConnection
 }
 
-module.exports = connection
\ No newline at end of file
+export = connection
\ No newline at end of file

functions/gitlab.ts

-const axios = require('axios')
+import axios from 'axios'
 
 var gitlab = {
-    getProjects: async function(perPage, idAfter) {
+    getProjects: async function(perPage:number, idAfter:number) {
         try {
             let projects = await axios({
                 method: 'get',
@@ -30,7 +30,7 @@ var gitlab = {
                 data: err}
         }
     },
-    getLatestPipelineStatus: async function(projectId) {
+    getLatestPipelineStatus: async function(projectId:number) {
         return axios({
             method: 'get',
             url: 'https://transfer.hft-stuttgart.de/gitlab/api/v4/projects/'+projectId+'/pipelines'
@@ -40,4 +40,4 @@ var gitlab = {
     }
 }
 
-module.exports = gitlab
\ No newline at end of file
+export = gitlab
\ No newline at end of file