From bb5dc8c803bf47bf6374f132d0f4a6b3d77ccee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A4rt=20Kalmo?= Date: Wed, 10 May 2017 09:57:37 +0300 Subject: [PATCH] starting state fixed --- server.js | 2 +- task-service.js | 34 +++------------------------------- task.js | 4 ++-- 3 files changed, 6 insertions(+), 34 deletions(-) diff --git a/server.js b/server.js index 4c9ddc0..e8d4cae 100644 --- a/server.js +++ b/server.js @@ -8,7 +8,7 @@ const app = express(); app.get('/api/tasks', getTasks); -app.listen(3000, () => console.log('Server is running...')); +app.listen(3000, () => console.log('Server is running on port 3000')); function getTasks(request, response) { dao.getTasks() diff --git a/task-service.js b/task-service.js index 9a08058..f9de35b 100644 --- a/task-service.js +++ b/task-service.js @@ -11,43 +11,15 @@ class MemTaskService { ]; } - clone(what) { - return JSON.parse(JSON.stringify(what)); - } - getTasks() { return Promise.resolve(this.clone(this.tasks)); } - getTask(id) { - let found = this.clone(this.tasks) - .filter(each => each._id === id) - .pop(); - - return found ? Promise.resolve(found) : Promise.reject('no task with id: ' + id); + clone(what) { + return JSON.parse(JSON.stringify(what)); } - saveTask(task) { - if (!task._id) { - task._id = this.getId(); - this.tasks.push(task); - return Promise.resolve(); - } - - this.tasks = this.tasks - .map(each =>each._id === task._id ? task : each); - - return Promise.resolve(); - } - - deleteTask(id) { - this.tasks = this.tasks - .filter(each => each._id !== id); - - return Promise.resolve(); - } - - getId() { + getNewId() { return (Math.random() + 'A').substr(2); } diff --git a/task.js b/task.js index a8e368d..5bf61db 100644 --- a/task.js +++ b/task.js @@ -1,8 +1,8 @@ 'use strict'; class Task { - constructor(title) { - this.title = title; + constructor(content) { + this.content = content; } static withId(id, title) {