Merge remote-tracking branch 'origin/master' into doubles-ss_master

# Conflicts:
#	server/database.js

server/model/api_key.js

@@ -0,0 +1,76 @@
+const { BeanModel } = require("redbean-node/dist/bean-model");
+const { R } = require("redbean-node");
+const dayjs = require("dayjs");
+
+class APIKey extends BeanModel {
+    /**
+     * Get the current status of this API key
+     * @returns {string} active, inactive or expired
+     */
+    getStatus() {
+        let current = dayjs();
+        let expiry = dayjs(this.expires);
+        if (expiry.diff(current) < 0) {
+            return "expired";
+        }
+
+        return this.active ? "active" : "inactive";
+    }
+
+    /**
+     * Returns an object that ready to parse to JSON
+     * @returns {Object}
+     */
+    toJSON() {
+        return {
+            id: this.id,
+            key: this.key,
+            name: this.name,
+            userID: this.user_id,
+            createdDate: this.created_date,
+            active: this.active,
+            expires: this.expires,
+            status: this.getStatus(),
+        };
+    }
+
+    /**
+     * Returns an object that ready to parse to JSON with sensitive fields
+     * removed
+     * @returns {Object}
+     */
+    toPublicJSON() {
+        return {
+            id: this.id,
+            name: this.name,
+            userID: this.user_id,
+            createdDate: this.created_date,
+            active: this.active,
+            expires: this.expires,
+            status: this.getStatus(),
+        };
+    }
+
+    /**
+     * Create a new API Key and store it in the database
+     * @param {Object} key Object sent by client
+     * @param {int} userID ID of socket user
+     * @returns {Promise<bean>}
+     */
+    static async save(key, userID) {
+        let bean;
+        bean = R.dispense("api_key");
+
+        bean.key = key.key;
+        bean.name = key.name;
+        bean.user_id = userID;
+        bean.active = key.active;
+        bean.expires = key.expires;
+
+        await R.store(bean);
+
+        return bean;
+    }
+}
+
+module.exports = APIKey;

server/model/maintenance_timeslot.js

@@ -41,6 +41,8 @@ class MaintenanceTimeslot extends BeanModel {
      * @returns {Promise<MaintenanceTimeslot>}
      */
     static async generateTimeslot(maintenance, minDate = null, removeExist = false) {
+        log.info("maintenance", "Generate Timeslot for maintenance id: " + maintenance.id);
+
         if (removeExist) {
             await R.exec("DELETE FROM maintenance_timeslot WHERE maintenance_id = ? ", [
                 maintenance.id
@@ -56,7 +58,14 @@ class MaintenanceTimeslot extends BeanModel {
             bean.start_date = maintenance.start_date;
             bean.end_date = maintenance.end_date;
             bean.generated_next = true;
-            return await R.store(bean);
+
+            if (!await this.isDuplicateTimeslot(bean)) {
+                await R.store(bean);
+                return bean;
+            } else {
+                log.debug("maintenance", "Duplicate timeslot, skip");
+                return null;
+            }
 
         } else if (maintenance.strategy === "recurring-interval") {
             // Prevent dead loop, in case interval_day is not set
@@ -142,6 +151,15 @@ class MaintenanceTimeslot extends BeanModel {
         }
     }
 
+    static async isDuplicateTimeslot(timeslot) {
+        let bean = await R.findOne("maintenance_timeslot", "maintenance_id = ? AND start_date = ? AND end_date = ?", [
+            timeslot.maintenance_id,
+            timeslot.start_date,
+            timeslot.end_date
+        ]);
+        return bean !== null;
+    }
+
     /**
      * Generate a next timeslot for all recurring types
      * @param maintenance
@@ -159,7 +177,7 @@ class MaintenanceTimeslot extends BeanModel {
 
         // Keep generating from the first possible date, until it is ok
         while (true) {
-            log.debug("timeslot", "startDateTime: " + startDateTime.format());
+            //log.debug("timeslot", "startDateTime: " + startDateTime.format());
 
             // Handling out of effective date range
             if (startDateTime.diff(dayjs.utc(maintenance.end_date)) > 0) {
@@ -191,7 +209,14 @@ class MaintenanceTimeslot extends BeanModel {
         bean.start_date = localToUTC(startDateTime);
         bean.end_date = localToUTC(endDateTime);
         bean.generated_next = false;
-        return await R.store(bean);
+
+        if (!await this.isDuplicateTimeslot(bean)) {
+            await R.store(bean);
+            return bean;
+        } else {
+            log.debug("maintenance", "Duplicate timeslot, skip");
+            return null;
+        }
     }
 }
 

server/model/monitor.js

@@ -72,6 +72,7 @@ class Monitor extends BeanModel {
         let data = {
             id: this.id,
             name: this.name,
+            description: this.description,
             url: this.url,
             method: this.method,
             hostname: this.hostname,