diff --git a/db/expense.json b/db/expense.json index 1bc75a6..1257e7a 100644 --- a/db/expense.json +++ b/db/expense.json @@ -1,5 +1 @@ -{ - "date": "2024-01-25", - "title": "Test Expense", - "amount": "100" -} \ No newline at end of file +{"date":"2024-01-25","title":"Test Expense","amount":"100"} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 28a4d31..4fbbc4f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "license": "GPL-3.0", "devDependencies": { "@mate-academy/eslint-config": "latest", - "@mate-academy/scripts": "^1.8.6", + "@mate-academy/scripts": "^2.1.3", "axios": "^1.7.2", "eslint": "^8.57.0", "eslint-plugin-jest": "^28.6.0", @@ -1468,10 +1468,11 @@ } }, "node_modules/@mate-academy/scripts": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-1.8.6.tgz", - "integrity": "sha512-b4om/whj4G9emyi84ORE3FRZzCRwRIesr8tJHXa8EvJdOaAPDpzcJ8A0sFfMsWH9NUOVmOwkBtOXDu5eZZ00Ig==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-2.1.3.tgz", + "integrity": "sha512-a07wHTj/1QUK2Aac5zHad+sGw4rIvcNl5lJmJpAD7OxeSbnCdyI6RXUHwXhjF5MaVo9YHrJ0xVahyERS2IIyBQ==", "dev": true, + "license": "MIT", "dependencies": { "@octokit/rest": "^17.11.2", "@types/get-port": "^4.2.0", diff --git a/package.json b/package.json index 8a92721..cd53c9e 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "license": "GPL-3.0", "devDependencies": { "@mate-academy/eslint-config": "latest", - "@mate-academy/scripts": "^1.8.6", + "@mate-academy/scripts": "^2.1.3", "axios": "^1.7.2", "eslint": "^8.57.0", "eslint-plugin-jest": "^28.6.0", diff --git a/public/index.html b/public/index.html new file mode 100644 index 0000000..958917a --- /dev/null +++ b/public/index.html @@ -0,0 +1,16 @@ + + + + + + Form-Data + + +
+ + + + +
+ + diff --git a/src/createServer.js b/src/createServer.js index 1cf1dda..bf6ea9f 100644 --- a/src/createServer.js +++ b/src/createServer.js @@ -1,8 +1,75 @@ 'use strict'; +const http = require('node:http'); +const fs = require('node:fs'); +const path = require('node:path'); + function createServer() { - /* Write your code here */ - // Return instance of http.Server class + const server = new http.Server(); + + server.on('request', (req, res) => { + const baseUrl = req.url; + const dbPath = path.resolve('db', 'expense.json'); + const mainPath = path.resolve('public', 'index.html'); + + if (baseUrl === '/') { + const stream = fs.createReadStream(mainPath); + + res.statusCode = 200; + res.setHeader('Content-Type', 'text/html'); + + return res.pipe(stream); + } + + if (baseUrl === '/add-expense') { + if (req.method !== 'POST') { + res.statusCode = 400; + + return res.end(); + } + + const chunks = []; + + req.on('data', (chunk) => { + chunks.push(chunk); + }); + + req.on('end', () => { + try { + const buffer = Buffer.concat(chunks).toString(); + const data = JSON.parse(buffer); + + if (!data.date || !data.title || !data.amount) { + fs.writeFileSync(dbPath, JSON.stringify({})); + + res.statusCode = 400; + res.setHeader('Content-Type', 'application/json'); + + return res.end(JSON.stringify('Missing fields')); + } + + fs.writeFileSync(dbPath, JSON.stringify(data)); + + res.statusCode = 200; + res.setHeader('Content-Type', 'application/json'); + + return res.end(JSON.stringify(data)); + } catch (e) { + res.statusCode = 400; + res.setHeader('Content-Type', 'application/json'); + + return res.end(JSON.stringify({ error: 'Invalid JSON' })); + } + }); + + return; + } + + res.statusCode = 404; + res.end(); + }); + + return server; } module.exports = { diff --git a/tests/formDataServer.test.js b/tests/formDataServer.test.js index 0ee1766..bf720a6 100644 --- a/tests/formDataServer.test.js +++ b/tests/formDataServer.test.js @@ -40,7 +40,7 @@ describe('Form Data Server', () => { }); it('should save data for valid expense on "POST /submit-expense" request', async () => { - fs.writeFileSync(dataPath, JSON.stringify({})); + fs.writeFileSync(dataPath, JSON.stringify([])); const expense = { date: '2024-01-25', @@ -57,7 +57,7 @@ describe('Form Data Server', () => { }); it('should reject request without all params on "POST /submit-expense" request', async () => { - fs.writeFileSync(dataPath, JSON.stringify({})); + fs.writeFileSync(dataPath, JSON.stringify([])); const expense = { title: 'Invalid Expense',