separate logic and data#20

JackDev21 · Jun 10, 2024 · 6d53917 · 6d53917
1 parent 09dfa45
commit 6d53917
Show file tree

Hide file tree

Showing 4 changed files with 86 additions and 60 deletions.
diff --git a/api/data/data.js b/api/data/data.js
@@ -0,0 +1,59 @@
+import fs from "fs"
+
+const data = {}
+
+data.findTasks = (condition, callback) => {
+
+  fs.readFile('../api/data/tasks.json', 'utf-8', (error, tasksJson) => {
+    if (error) {
+      console.log(error)
+      callback(error)
+      return
+    }
+
+    if (!tasksJson) {
+      tasksJson = '[]'
+    }
+
+    const tasks = JSON.parse(tasksJson)
+
+    const filtered = tasks.filter(condition)
+
+    callback(null, filtered)
+  })
+}
+
+
+data.insertTask = (task, callback) => {
+  fs.readFile('../api/data/tasks.json', 'utf-8', (error, tasksJson) => {
+    if (error) {
+      console.log(error)
+
+      return
+    }
+
+    if (!tasksJson) {
+      tasksJson = '[]'
+    }
+    const tasks = JSON.parse(tasksJson)
+
+    task.id = `${Math.random().toString().slice(2)}-${Date.now()}`
+
+    tasks.push(task)
+
+    const jsonTasks = JSON.stringify(tasks)
+
+    fs.writeFile('../api/data/tasks.json', jsonTasks, (error) => {
+      if (error) {
+        console.log(error)
+
+        return
+      }
+
+      callback(null)
+    })
+  })
+
+}
+
+export default data
diff --git a/api/data/tasks.json b/api/data/tasks.json
@@ -1,6 +1,4 @@
 [
-	{ "text": "Tarea Prueba", "id": "9691749823042075-1717951418737" },
-	{ "text": "Tarea 2", "id": "8822678026350037-1717951589854" },
-	{ "text": "Tarea 3", "id": "49480507403849905-1717951598149" },
-	{ "text": "Lorena es tonta del to", "id": "9158222028142664-1717951606748" }
+	{ "text": "Test prueba", "id": "8322284392957846-1718037846180" },
+	{ "text": "Test 2", "id": "9554433903962911-1718038107817" }
 ]
diff --git a/api/logic/index.test.js b/api/logic/index.test.js
@@ -1,18 +1,18 @@
 import logic from "./logic.js"
-// try {
-//     logic.findTasks(() => true, (error, tasks) => {
-//         if (error) {
-//             console.log(error)
+try {
+  logic.findTasks(() => true, (error, tasks) => {
+    if (error) {
+      console.log(error)
 
-//         }
+    }
 
-//         console.log(tasks)
+    console.log(tasks)
 
-//     })
-// } catch (error) {
+  })
+} catch (error) {
 
-//     console.log(error)
-// }
+  console.log(error)
+}
 
 
 

diff --git a/api/logic/logic.js b/api/logic/logic.js
@@ -1,67 +1,36 @@
-import fs from 'fs'
+
+import data from "../data/data.js"
 
 const logic = {}
 
-logic.findTasks = (condition, callback) => {
-    fs.readFile('../api/data/tasks.json', 'utf-8', (error, tasksJson) => {
-        if (error) {
-            console.log(error)
+logic.getAllTasks = (callback) => {
 
-            return
-        }
+    data.findTasks(() => true, (error, tasks) => {
 
-        if (!tasksJson) {
-            tasksJson = '[]'
+        if (error) {
+            callback(error)
+            return
         }
 
-        const tasks = JSON.parse(tasksJson)
-
-        const taskFind = tasks.filter(condition)
-
-        callback(null, taskFind)
+        callback(null, tasks)
     })
-
-
 }
 
 logic.createTask = (text, callback) => {
     const task = {
-
         text: text,
     }
 
-    const insertTask = (task, callback) => {
-        fs.readFile('../api/data/tasks.json', 'utf-8', (error, tasksJson) => {
-            if (error) {
-                console.log(error)
+    data.insertTask(task, (error) => {
 
-                return
-            }
-
-            if (!tasksJson) {
-                tasksJson = '[]'
-            }
-            const tasks = JSON.parse(tasksJson)
-
-            task.id = `${Math.random().toString().slice(2)}-${Date.now()}`
-
-            tasks.push(task)
-
-            const jsonTasks = JSON.stringify(tasks)
-
-            fs.writeFile('../api/data/tasks.json', jsonTasks, (error) => {
-                if (error) {
-                    console.log(error)
+        if (error) {
+            callback(error)
+            return
+        }
 
-                    return
-                }
+        callback(null)
 
-                callback(null)
-            })
-        })
-    }
-    insertTask(task, callback);
+    })
 }
 
-
 export default logic