Renamed js files to ts

src/utils/actions.ts

@@ -26,27 +26,36 @@ module.exports = {
 const recDataFile = './stats/recdata'
 const dataLockFile = './data/lockData'
 
-import { Db } from '../types/basicTypes'
-
 import logger from '../utils/logger.js'
+import { searchData, createQuestion } from '../utils/classes.js'
+import idStats from '../utils/ids.js'
+import utils from '../utils/utils.js'
+import { addQuestion, getSubjNameWithoutYear } from './classes.js'
+
+// types
+import { QuestionDb, Question, User } from '../types/basicTypes'
+import { DataFile } from '../modules/api/api'
 
-// const logger = require('../utils/logger.js')
-const { searchData, createQuestion } = require('../utils/classes.js')
-const idStats = require('../utils/ids.js')
-const utils = require('../utils/utils.js')
-const { addQuestion, getSubjNameWithoutYear } = require('./classes.js')
 // if a recievend question doesnt match at least this % to any other question in the db it gets
 // added to db
 const minMatchToAmmountToAdd = 90
 
 const writeAfter = 1 // write after # of adds FIXME: set reasonable save rate
-var currWrites = 0
+let currWrites = 0
+
+interface RecievedData {
+  quiz: Array<Question>
+  subj: string
+  id: string
+  version: string
+  scriptVersion: string
+}
 
 function ProcessIncomingRequest(
-  recievedData,
-  questionDbs: Array<Db>,
+  recievedData: RecievedData,
+  questionDbs: Array<QuestionDb>,
   dryRun: boolean,
-  user
+  user: User
 ) {
   return Promise.all(
     questionDbs.map((qdb) => {
@@ -55,7 +64,12 @@ function ProcessIncomingRequest(
   )
 }
 
-function ProcessIncomingRequestUsingDb(recievedData, qdb: Db, dryRun, user) {
+function ProcessIncomingRequestUsingDb(
+  recievedData: RecievedData,
+  qdb: QuestionDb,
+  dryRun: boolean,
+  user: User
+) {
   return new Promise((resolve, reject) => {
     logger.DebugLog('Processing incoming request', 'actions', 1)
 
@@ -92,34 +106,29 @@ function ProcessIncomingRequestUsingDb(recievedData, qdb: Db, dryRun, user) {
 
     try {
       // recievedData: { version: "", id: "", subj: "" quiz: {} }
-      let data = recievedData
       const recievedQuestions = []
-      // FIXME: if is for backwards compatibility, remove this sometime in the future
-      if (typeof data !== 'object') {
-        data = JSON.parse(recievedData)
-      }
 
       logger.DebugLog('recievedData JSON  parsed', 'actions', 1)
-      logger.DebugLog(data, 'actions', 3)
-      let allQLength = data.quiz.length
+      logger.DebugLog(recievedData, 'actions', 3)
+      const allQLength = recievedData.quiz.length
       const questionSearchPromises = []
-      data.quiz.forEach((question) => {
+      recievedData.quiz.forEach((question) => {
         logger.DebugLog('Question:', 'actions', 2)
         logger.DebugLog(question, 'actions', 2)
-        let currentQuestion = createQuestion(
+        const currentQuestion = createQuestion(
           question.Q,
           question.A,
           question.data
         )
         logger.DebugLog(
-          'Searching for question in subj ' + data.subj,
+          'Searching for question in subj ' + recievedData.subj,
           'actions',
           3
         )
         logger.DebugLog(currentQuestion, 'actions', 3)
         recievedQuestions.push(currentQuestion)
         questionSearchPromises.push(
-          searchData(qdb.data, currentQuestion, data.subj)
+          searchData(qdb.data, currentQuestion, recievedData.subj)
         )
       })
 
@@ -127,7 +136,7 @@ function ProcessIncomingRequestUsingDb(recievedData, qdb: Db, dryRun, user) {
         .then((results) => {
           const allQuestions = [] // all new questions here that do not have result
           results.forEach((result, i) => {
-            let add = result.every((res) => {
+            const add = result.every((res) => {
               return res.match < minMatchToAmmountToAdd
             })
             if (add) {
@@ -142,7 +151,7 @@ function ProcessIncomingRequestUsingDb(recievedData, qdb: Db, dryRun, user) {
               color = logger.GetColor('blue')
               msg += `New questions: ${allQuestions.length} ( All: ${allQLength} )`
               allQuestions.forEach((currentQuestion) => {
-                const sName = getSubjNameWithoutYear(data.subj)
+                const sName = getSubjNameWithoutYear(recievedData.subj)
                 logger.DebugLog(
                   'Adding question with subjName: ' + sName + ' :',
                   'actions',
@@ -170,14 +179,19 @@ function ProcessIncomingRequestUsingDb(recievedData, qdb: Db, dryRun, user) {
               msg += `No new data ( ${allQLength} )`
             }
 
-            let subjRow = '\t' + data.subj
-            if (data.id) {
-              subjRow += ' ( CID: ' + logger.logHashed(data.id) + ')'
+            let subjRow = '\t' + recievedData.subj
+            if (recievedData.id) {
+              subjRow += ' ( CID: ' + logger.logHashed(recievedData.id) + ')'
             }
-            idStats.LogId(user.id, data.subj, allQuestions.length, allQLength)
+            idStats.LogId(
+              user.id,
+              recievedData.subj,
+              allQuestions.length,
+              allQLength
+            )
             logger.Log(subjRow)
-            if (data.version !== undefined) {
-              msg += '. Version: ' + data.version
+            if (recievedData.version !== undefined) {
+              msg += '. Version: ' + recievedData.version
             }
 
             logger.Log('\t' + msg, color)
@@ -215,7 +229,7 @@ function ProcessIncomingRequestUsingDb(recievedData, qdb: Db, dryRun, user) {
   })
 }
 
-function LoadJSON(dataFiles) {
+function LoadJSON(dataFiles: Array<DataFile>) {
   return dataFiles.reduce((acc, dataFile) => {
     if (!utils.FileExists(dataFile.path)) {
       utils.WriteFile(JSON.stringify([]), dataFile.path)
@@ -237,7 +251,7 @@ function LoadJSON(dataFiles) {
   }, [])
 }
 
-function backupData(questionDbs) {
+function backupData(questionDbs: Array<DataFile>) {
   questionDbs.forEach((data) => {
     const path = './publicDirs/qminingPublic/backs/'
     utils.CreatePath(path)