sdd1.04a and more robust record_sdd() function

Author: phgrosjean

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: BioDataScience
 Type: Package
-Version: 0.6.0
+Version: 0.7.0
 Title: A Series of Learnr Documents for Biological Data Science
 Description: Interactive documents using learnr for studying biological data science.
 Authors@R: c(

NEWS.md

@@ -1,12 +1,23 @@
 # BioDataScience News
 
+## Changes in version 0.7.0
+
+- Tutorial 04a_test finalized
+
+
+## Changes in version 0.6.1
+
+- More robust code for record_sdd()
+
+
 ## Changes in version 0.6.0
 
 - Tutorial 03a_test finalized
 
+
 ## Changes in version 0.5.0
 
-- add new datasest biometry
+- Add new dataset biometry
 
 
 ## Changes in version 0.4.0

R/record_sdd.R

@@ -45,6 +45,7 @@ record_sdd <- function(tutorial_id, tutorial_version, user_id, event, data) {
   #}
   # Once http request with stitch will be available, we could do something like
   #https://stitch.mongodb.com/api/client/v2.0/app/sdd-relay-aizkd/service/sdd-http/incoming_webhook/webhook0
+  db_injected <- FALSE
   m <- try(mongo("sdd",
     #url = "mongodb://sdd:sdd@ds125388.mlab.com:25388/sdd-test")$insert(entry)
     url = "mongodb://sdd:sdd@sdd-umons-shard-00-00-umnnw.mongodb.net:27017,sdd-umons-shard-00-01-umnnw.mongodb.net:27017,sdd-umons-shard-00-02-umnnw.mongodb.net:27017/test?ssl=true&replicaSet=sdd-umons-shard-0&authSource=admin"),
@@ -53,18 +54,24 @@ record_sdd <- function(tutorial_id, tutorial_version, user_id, event, data) {
       # No run() methods in mongolite 1.5
       #m$run(command = "{\"ping\": 1}", simplify = TRUE)$ok == 1) {
       m$count() > -1) {
-    m$insert(entry)
+    res <- try(m$insert(entry), silent = TRUE)
     # If there is something in the biodatascience file, inject it also now
-    if (file.exists(bds_file)) {
-      dat <- readLines(bds_file)
-      unlink(bds_file)
-      if (length(dat))
-        for (i in 1:length(dat))
-          m$insert(unserialize(base64_dec(dat[i])))
+    if (!inherits(res, "try-error")) {
+      db_injected <- TRUE
+      # Check if we also need to inject pending records
+      if (file.exists(bds_file)) {
+        dat <- readLines(bds_file)
+        unlink(bds_file)
+        if (length(dat))
+          for (i in 1:length(dat))
+            m$insert(unserialize(base64_dec(dat[i])))
+      }
     }
     # No disconnect() method in mongolite 1.5
     #m$disconnect()
-  } else {# MongoDB database not available... save locally
+  }
+  # Only get rid of the entry if it was actually injected in the database
+  if (!isTRUE(db_injected)) {# MongoDB database not available, or error... save locally
     add_file_base64(entry, file = bds_file)
   }
 }