From 164e22d888206638700763fbf8f670c798b37d88 Mon Sep 17 00:00:00 2001
From: mrfry <mr.fry@tutanota.com>
Date: Wed, 26 May 2021 16:10:58 +0200
Subject: [PATCH] Minor db struct changes

---
 src/modules/api/apiDBStruct.json  | 8 --------
 src/standaloneUtils/dbSetup.js    | 1 -
 src/types/basicTypes.ts           | 2 +-
 submodules/moodle-test-userscript | 2 +-
 submodules/qmining-page           | 2 +-
 5 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/modules/api/apiDBStruct.json b/src/modules/api/apiDBStruct.json
index fa5e7bc..84cc4c0 100644
--- a/src/modules/api/apiDBStruct.json
+++ b/src/modules/api/apiDBStruct.json
@@ -11,10 +11,6 @@
         "notNull": true,
         "unique": true
       },
-      "oldCID": {
-        "type": "text",
-        "unique": true
-      },
       "notes": {
         "type": "text"
       },
@@ -40,10 +36,6 @@
         "type": "number",
         "defaultZero": true
       },
-      "pwGotFromCID": {
-        "type": "number",
-        "defaultZero": true
-      },
       "createdBy": {
         "type": "number"
       }
diff --git a/src/standaloneUtils/dbSetup.js b/src/standaloneUtils/dbSetup.js
index 6026597..a46ee93 100644
--- a/src/standaloneUtils/dbSetup.js
+++ b/src/standaloneUtils/dbSetup.js
@@ -40,7 +40,6 @@ function CreateDB() {
         try {
           dbtools.Insert(authDB, 'users', {
             pw: uuidv4(),
-            oldCID: cid,
             avaiblePWRequests: 4,
             created: utils.GetDateString(),
           })
diff --git a/src/types/basicTypes.ts b/src/types/basicTypes.ts
index 4a050df..1472aee 100644
--- a/src/types/basicTypes.ts
+++ b/src/types/basicTypes.ts
@@ -63,9 +63,9 @@ export interface User {
   id: number
   pw: string
   pwRequestCount: number
-  pwGotFromCID: number
   avaiblePWRequests: number
   loginCount: number
+  createdBy: number
 }
 
 export interface Request extends express.Request {
diff --git a/submodules/moodle-test-userscript b/submodules/moodle-test-userscript
index 00ceb74..27211c7 160000
--- a/submodules/moodle-test-userscript
+++ b/submodules/moodle-test-userscript
@@ -1 +1 @@
-Subproject commit 00ceb74ba763ebbca1a3edc8f0fc682e59f214a3
+Subproject commit 27211c7bc83e0e930fabc430ffb5615b52523106
diff --git a/submodules/qmining-page b/submodules/qmining-page
index 5d233f5..dafcefd 160000
--- a/submodules/qmining-page
+++ b/submodules/qmining-page
@@ -1 +1 @@
-Subproject commit 5d233f549dbaf3dd608481b3dddda67e41d4bea0
+Subproject commit dafcefd4f459d14737a9922cc4ba0400fbc9040a