remake API to use Postgres instead of File storage

rusikf · rusikf · commit b4491a25b286 · 2021-11-19T21:14:14.000+02:00
diff --git a/config/config.js b/config/config.js
diff --git a/config/config.json b/config/config.json
@@ -0,0 +1,16 @@
+{
+  "development": {
+    "username": "rusik",
+    "password": "123",
+    "database": "users_app_development",
+    "host": "127.0.0.1",
+    "dialect": "postgres"
+  },
+  "test": {
+    "username": "rusik",
+    "password": "123",
+    "database": "users_app_test",
+    "host": "127.0.0.1",
+    "dialect": "postgres"
+  }
+}
diff --git a/controllers/users.js b/controllers/users.js
@@ -1,29 +1,30 @@
-import { readUsers } from '../store'
 import UsersCreate from '../services/users/create'
 import UsersUpdate from '../services/users/update'
 import UsersDelete from '../services/users/delete'
+import Repository from '../repositories/users'
 
 export default function App(app) {
-  app.get('/users', (_req, res) => {
-    console.log('get users')
-    const users = readUsers()
-    return res.send({ success: true, users })
+  app.get('/users', async (_req, res) => {
+    const repo = new Repository()
+    const users = await repo.list()
+
+    return res.status(200).json(users)
   })
 
-  app.post('/users', (req, res) => {
+  app.post('/users', async (req, res) => {
     const { user } = new UsersCreate(req.body)
-    return res.send({ success: true, user })
+    return res.status(201).json(user)
   })
 
   app.patch('/users/:id', (req, res) => {
     const params = { ...req.body, id: req.params.id }
     const { user } = new UsersUpdate(params)
-    return res.send({ success: true, user })
+    return res.status(201).json(user)
   })
 
   app.delete('/users/:id', (req, res) => {
     const { id } = req.params
     new UsersDelete(id)
-    return res.send( { success: true })
+    return res.status(201).json({ deleted: true })
   })
 }
diff --git a/repositories/users.js b/repositories/users.js
@@ -0,0 +1,8 @@
+import models from '../models/index'
+const { User } = models;
+
+export default class UsersRepository {
+  async list() {
+    return await User.findAll()
+  }
+}
diff --git a/server.js b/server.js
@@ -1,3 +1,4 @@
+require('dotenv').config()
 const express = require("express")
 import useRoutes from './controllers/users'
 
diff --git a/services/users/create.js b/services/users/create.js
@@ -1,12 +1,7 @@
-import { readUsers, saveUsers } from '~/store'
+import models from '../../models/index'
+const { User } = models;
 
-export default params => {
-  const users = readUsers()
-
-  const existUser = users.find(user => user.id === params.id)
-  if (existUser) return
-  users.push(params)
-  saveUsers(users)
-  console.log('return params',)
-  return params
+export default async (params) => {
+  const { user } = await User.create(params)
+  return { user }
 }
diff --git a/services/users/delete.js b/services/users/delete.js
@@ -1,15 +1,6 @@
-import { readUsers, saveUsers } from '~/store'
+import models from '../../models/index'
+const { User } = models;
 
-export default id => {
-  const users = readUsers()
-
-  const existUser = users.find(user => user.id === id)
-  if (!existUser) return
-
-  const newUsers = users.map(user => user.id === id ? null : user)
-    .filter(user => user)
-
-  saveUsers(newUsers)
-
-  return
+export default async (id) => {
+  await User.destroy({ where: { id: id }})
 }
diff --git a/services/users/update.js b/services/users/update.js
@@ -1,19 +1,8 @@
-import { readUsers, saveUsers } from '~/store'
+import models from '../../models/index'
+const { User } = models
 
-export default params => {
-  const users = readUsers()
-
-  const existUser = users.find(user => user.id === params.id)
-  if (!existUser) return
-
-  const newUsers = users.map(user => {
-    if (user.id === params.id) {
-      return { ...user, ...params }
-    } else {
-      return user
-    }
-  })
-
-  saveUsers(newUsers)
-  return params
+export default async (params) => {
+  const { id, ...attributes } = params
+  await User.update(attributes, { where: { id: id } })
+  return { user: await User.findOne({ where: { id: id }}) }
 }
diff --git a/store.js b/store.js
diff --git a/users.json b/users.json

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+require('dotenv').config()`
`1`	`2`	`const express = require("express")`
`2`	`3`	`import useRoutes from './controllers/users'`
`3`	`4`