clean relicts from mongo

softwerkskammer · Jun 2, 2024 · b9de668 · b9de668
1 parent e4f97f0
commit b9de668
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 282 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,8 +11,6 @@
 .idea/workspace.xml
 *.iml
 
-.vagrant
-
 *.log
 
 node_modules/
@@ -22,10 +20,6 @@ config/*.json*
 !config/testbeans.json
 !config/testbeansWithDB.json
 
-dev-goodies
-!dev-goodies/icon_WebStorm.png
-!dev-goodies/mongo snippets.txt
-
 **/build
 **/*coverage*
 **/fixtures/*.html
@@ -46,5 +40,9 @@ docker/mongo/
 /softwerkskammer/chado-result.json
 /.idea/shelf
 /2023-12-24
+/2024-06-01
 /.idea/prettier.xml
 /mongoimport_agora.sh
+/backups/
+*.gz
+db/*
diff --git a/backup-db.sh b/backup-db.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+node ./backup-sqlite.js ../backups
diff --git a/config-examples/mongo-config.json b/config-examples/mongo-config.json
diff --git a/dev-goodies/mongo snippets.txt b/dev-goodies/mongo snippets.txt
diff --git a/migrateToSQLite.sh b/migrateToSQLite.sh
diff --git a/package.json b/package.json
@@ -53,7 +53,6 @@
     "luxon": "3.4.4",
     "marked": "12.0.2",
     "mime-types": "2.1.35",
-    "mongodb": "6.5.0",
     "morgan": "1.10.0",
     "multiparty": "4.2.3",
     "node-syntaxhighlighter": "0.8.1",

diff --git a/softwerkskammer/configure.js b/softwerkskammer/configure.js
@@ -42,13 +42,11 @@ function createConfiguration() {
 
   // then, add properties from config files:
   const files = [
-    "mongo-config.json",
     "server-config.json",
     "authentication-config.json",
     "mailsender-config.json",
     "wikirepo-config.json",
     "activityresults-config.json",
-    "socrates-config.json",
   ];
   conf.addFiles(files.map((file) => configdir + file));
 

diff --git a/softwerkskammer/lib/migrateToSqlite/migrateAllFromMongo.js b/softwerkskammer/lib/migrateToSqlite/migrateAllFromMongo.js
diff --git a/softwerkskammer/lib/persistence/sqlitePersistence.js b/softwerkskammer/lib/persistence/sqlitePersistence.js
@@ -40,7 +40,8 @@ function execWithTry(command) {
 
 module.exports = function sqlitePersistenceFunc(collectionName, extraColumns) {
   const extraCols = extraColumns ? extraColumns.split(",") : [];
-  function create() {
+
+  function createForTest() {
     const columns = ["id TEXT PRIMARY KEY", "data BLOB"].concat(
       extraCols.map((col) => {
         if (col === "version") {
@@ -61,7 +62,6 @@ module.exports = function sqlitePersistenceFunc(collectionName, extraColumns) {
     }
   }
 
-  create();
   const colsForSave = ["id", "data"].concat(extraCols);
 
   const persistence = {
@@ -171,8 +171,12 @@ module.exports = function sqlitePersistenceFunc(collectionName, extraColumns) {
     },
 
     recreateForTest() {
-      db.exec(`DROP TABLE IF EXISTS ${collectionName};`);
-      create();
+      if (collectionName === "teststore") {
+        db.exec(`DROP TABLE IF EXISTS ${collectionName};`);
+        createForTest();
+      } else {
+        console.error("Trying to drop a production collection?"); // eslint-disable-line no-console
+      }
     },
   };
   return persistence;