Merge pull request 'main' (#20) from main into dev

Reviewed-on: #20

router/radio.js

@@ -56,9 +56,9 @@ router
         if (radio) {
           if (req.files.file) {
             resize_image_for_radio(req.files.file.data, (result) => {
-              radio.cover32 = result.cover32;
+              radio.covers.cover32 = result.cover32;
-              radio.cover64 = result.cover64;
+              radio.covers.cover64 = result.cover64;
-              radio.cover128 = result.cover128;
+              radio.covers.cover128 = result.cover128;
               database.radios.update(radio);
               res.json(radio).end();
             });

router/user.js

@@ -138,11 +138,6 @@ router
 
 router
   .route("/history")
-  .get(passport.authenticate("jwt", { session: false }), (req, res) => {
-    database.historyList(req.user._id, result => {
-      res.json(result).end();
-    });
-  })
   .post(passport.authenticate("jwt", { session: false }), (req, res) => {
     let item = req.body;
     item.userId = req.user._id;
@@ -159,6 +154,31 @@ router
     });
   });
 
+router
+  .route("/progress")
+  .post(passport.authenticate("jwt", { session: false }), (req, res) => {
+    let item = req.body;
+    item.userId = req.user._id;
+    database.progress.update(item);
+    res.status(200).end();
+  });
+
+router
+  .route("/progress/:parent")
+  .get(passport.authenticate("jwt", { session: false }), (req, res) => {
+    database.progress.get(req.params.parent, result => {
+      res.json(result).end();
+    });
+  })
+  .delete(passport.authenticate("jwt", { session: false }), (req, res) => {
+    let item = {
+      parentId: req.params.parent,
+      userId: req.user._id
+    }
+    database.progress.delete(item);
+    res.status(200).end();
+  });
+
 router
   .route("/settings")
   .put(passport.authenticate("jwt", { session: false }), (req, res) => {

services/database/index.js

@@ -62,6 +62,9 @@ exports.artists = artists;
 const boxes = require("./boxes");
 exports.boxes = boxes;
 
+const progress = require("./progress");
+exports.progress = progress;
+
 const videos = require("./videos");
 exports.videos = videos;
 

services/database/progress.js

@@ -0,0 +1,27 @@
+const { ObjectId } = require('mongodb');
+const connector = require("./CONNECTOR");
+var dbo;
+connector.connect().then((ret) => {
+  dbo = ret;
+});
+
+exports.get = function (parentId, callback) {
+  dbo.collection("progress")
+    .findOne({ parentId: parentId }, (err, result) => {
+      if (err) throw err;
+      callback(result);
+    });
+}
+exports.update = function (item) {
+  dbo.collection("progress").deleteMany({ userId: ObjectId(item.userId), parentId: item.parentId }, () => {
+    dbo.collection("progress").insertOne(item, (err) => {
+      if (err) throw err;
+    });
+  });
+};
+
+exports.delete = function (item) {
+  dbo.collection("progress").deleteMany({ userId: ObjectId(item.userId), parentId: item.parentId }, (err) => {
+    if (err) throw err;
+  });
+}

services/database/radios.js

@@ -13,6 +13,9 @@ exports.collection = function (callback) {
     .toArray((err, result) => {
       result.forEach(item => {
         item.type = "radio";
+        if (!item.covers) {
+          item.covers = {};
+        }
       });
       callback(result);
     });
@@ -23,6 +26,9 @@ exports.byId = function (id, callback) {
     .collection("radios")
     .findOne({ _id: ObjectId(id) }, (err, result) => {
       if (err) throw err;
+      if (!result.covers) {
+        result.covers = {};
+      }
       callback(result);
     });
 };
@@ -63,9 +69,7 @@ exports.update = function (radio, callback) {
       $set: {
         name: radio.name,
         url: radio.url,
-        cover32: radio.cover32,
+        covers: radio.covers
-        cover64: radio.cover64,
-        cover128: radio.cover128
       }
     },
     { upsert: false },