From d8b0c2847109c0315d11ab9469ef3c8fb1ecaeb0 Mon Sep 17 00:00:00 2001
From: mrfry <mr.fry@tutanota.com>
Date: Tue, 4 May 2021 10:28:20 +0200
Subject: [PATCH] Minor changes, added example classes test

---
 src/modules.json                        |  6 +++---
 src/modules/api/submodules/userFiles.ts |  7 +++++--
 src/utils/classes.test.ts               | 25 +++++++++++++++++++++++++
 src/utils/classes.ts                    |  7 ++-----
 4 files changed, 35 insertions(+), 10 deletions(-)
 create mode 100644 src/utils/classes.test.ts

diff --git a/src/modules.json b/src/modules.json
index df25d58..479ca8f 100644
--- a/src/modules.json
+++ b/src/modules.json
@@ -19,8 +19,7 @@
     "nextdir": "nextStatic/qminingPagePublic",
     "name": "qmining",
     "urls": [
-      "qmining.frylabs.net",
-      "localhost"
+      "qmining.frylabs.net"
     ],
     "isNextJs": true
   },
@@ -31,7 +30,8 @@
     ],
     "name": "api",
     "urls": [
-      "api.frylabs.net"
+      "api.frylabs.net",
+      "localhost"
     ]
   },
   "main": {
diff --git a/src/modules/api/submodules/userFiles.ts b/src/modules/api/submodules/userFiles.ts
index f1486eb..134648d 100644
--- a/src/modules/api/submodules/userFiles.ts
+++ b/src/modules/api/submodules/userFiles.ts
@@ -12,7 +12,6 @@ function setup(data: SubmoduleData): void {
   const publicDir = publicdirs[0]
 
   const userFilesDir = publicDir + 'userFiles'
-
   if (!utils.FileExists(userFilesDir)) {
     utils.CreatePath(userFilesDir, true)
   }
@@ -20,6 +19,10 @@ function setup(data: SubmoduleData): void {
   app.get('/listUserDir', (req: Request, res) => {
     logger.LogReq(req)
 
+    if (!utils.FileExists(userFilesDir)) {
+      utils.CreatePath(userFilesDir, true)
+    }
+
     const subdir: any = req.query.subdir
 
     if (subdir) {
@@ -168,7 +171,7 @@ function setup(data: SubmoduleData): void {
     }
 
     utils
-      .uploadFile(req, userFilesDir + '/' + safeDir)
+      .uploadFile(req, userFilesDir + '/' + safeDir, true)
       .then((body) => {
         logger.Log(
           `Successfull upload ${body.filePath}`,
diff --git a/src/utils/classes.test.ts b/src/utils/classes.test.ts
new file mode 100644
index 0000000..8c37832
--- /dev/null
+++ b/src/utils/classes.test.ts
@@ -0,0 +1,25 @@
+import { compareString } from './classes'
+
+const testCases: Array<{ s1: string; s2: string; res: number }> = [
+  { s1: 'hello', s2: 'hello', res: 100 },
+  { s1: 'aaaaa', s2: 'bbbbb', res: 0 },
+  {
+    s1: 'Mely állítás nem igaz a tőzsdékre?',
+    s2: 'Mely állítás nem igaz a tőzsdékre?',
+    res: 100,
+  },
+  {
+    s1: 'Mely állítás nem igaz a tőzsdékre?',
+    s2: 'Ez egy teljesen más mondat',
+    res: 0,
+  },
+  { s1: 'cHar caSe tESt', s2: 'ChaR cAse TEst', res: 0 },
+]
+
+testCases.forEach((currCase) => {
+  const { s1, s2, res } = currCase
+
+  test(`String compare tests: "${s1}" & "${s2}" should be: ${res}%`, () => {
+    expect(compareString(s1, s1.split(' '), s2, s2.split(' '))).toBe(res)
+  })
+})
diff --git a/src/utils/classes.ts b/src/utils/classes.ts
index 64089b3..28f76bb 100755
--- a/src/utils/classes.ts
+++ b/src/utils/classes.ts
@@ -65,10 +65,7 @@ function getSubjNameWithoutYear(subjName: string): string {
 // ---------------------------------------------------------------------------------------------------------
 
 function simplifyString(toremove) {
-  return toremove
-    .replace(/\s/g, ' ')
-    .replace(/\s+/g, ' ')
-    .toLowerCase()
+  return toremove.replace(/\s/g, ' ').replace(/\s+/g, ' ').toLowerCase()
 }
 
 function removeStuff(
@@ -92,7 +89,7 @@ function removeUnnecesarySpaces(toremove: string) {
   return normalizeSpaces(toremove).replace(/\s+/g, ' ')
 }
 
-function compareString(
+export function compareString(
   s1: string,
   s1a: Array<string>,
   s2: string,