Soroka-80: добавляет импорт карточек из csv-файла (#9) (#17)

* [feat] Add csv into deps * [fix] Fix db env getting * [feat] Add express formidable into deps * [feat] Add migrations for change FilledProperty fields: name, data * [feat] Change max len for data field * [feat] Add custom component for csv import action * [fix] Delete name field from destruction * [feat] Add csv import endpoint * Добавляет скоупы, фиксит баги в авторизации (#10) * [ref] Add scopes, fix auth errors * [fix] Make date property nullable * SOROKA-82: добавляет утилиту для пагинации и пагинацию для эндпоинта с карточками (#16) * [feat] Add pagination on cards Co-authored-by: David Dobryakov <[email protected]>
dh-center · Jun 29, 2022 · 6e42bda · 6e42bda
1 parent d5b0015
commit 6e42bda
Show file tree

Hide file tree

Showing 19 changed files with 472 additions and 32 deletions.
diff --git a/.adminjs/.entry.js b/.adminjs/.entry.js
@@ -1 +1,3 @@
 AdminJS.UserComponents = {}
+import Component1 from '../src/admin/components/import-action-component'
+AdminJS.UserComponents.Component1 = Component1
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,6 +7,8 @@ services:
             - 5432
         volumes:
             - ./dbs/postgres-data:/var/lib/postgresql
+        env_file:
+            - .env
 
     backend:
         container_name: soroka-backend

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
         "@types/bcrypt": "^5.0.0",
         "@types/cors": "^2.8.12",
         "@types/express": "^4.17.13",
+        "@types/express-formidable": "^1.2.0",
         "@types/express-session": "^1.17.4",
         "@types/flat": "^5.0.2",
         "@types/node": "^17.0.8",
@@ -47,7 +48,9 @@
         "bcryptjs": "^2.4.3",
         "body-parser": "^1.19.1",
         "cors": "^2.8.5",
+        "csv": "^6.1.3",
         "express": "^4.17.2",
+        "express-formidable": "^1.2.0",
         "passport": "^0.5.2",
         "passport-jwt": "^4.0.0",
         "pg": "^8.7.3",

diff --git a/src/admin/components/import-action-component.jsx b/src/admin/components/import-action-component.jsx
@@ -0,0 +1,44 @@
+import React from 'react'
+
+const ImportAction = () => {
+    async function submitForm(form) {
+        const formData = new FormData(form)
+
+        const response = await fetch(
+            '/v1/admin/import-csv',
+            {
+                method: 'POST',
+                body: formData
+            }
+        )
+
+        if (response.status === 200) {
+            form.reset()
+
+            alert('Импорт завершён')
+        }
+    }
+
+    return (
+        <form
+            style={{display: "flex", flexDirection: "column"}}
+            onSubmit={(event) => {
+                event.preventDefault()
+                submitForm(event.target)
+            }}
+        >
+            <label style={{fontSize: "1.5rem"}} htmlFor="csvFile">
+                Choose CSV:
+            </label>
+            <input style={{marginTop: "1.5rem"}} name="csvFile" type="file" id="csvFile" />
+            <button
+                style={{marginTop: "1.5rem", maxWidth: "25%"}} 
+                type="submit"
+            >
+                Отправить
+            </button>
+        </form>
+    )
+}
+
+export default ImportAction
diff --git a/src/controllers/cards/Card.ts b/src/controllers/cards/Card.ts
@@ -7,9 +7,13 @@ class CardController implements ICardController {
     }
 
     getAll = async (request: Request, response: Response) => {
-        const cardsList = await this.cardService.getAll(request.user)
+        const cardsResponse = await this.cardService.getAll(
+            request.user,
+            Number(request.query.limit) || null,
+            Number(request.query.offset) || null
+        )
 
-        return response.send(cardsList)
+        return response.send(cardsResponse)
     }
 
     create = async (request: Request, response: Response) => {

diff --git a/src/controllers/users/User.ts b/src/controllers/users/User.ts
@@ -75,13 +75,13 @@ class UserController implements IUserController {
                 if (tokens) {
                     const { accessToken, refreshToken } = tokens
 
-                    response.send({ accessToken, refreshToken })
+                    return response.send({ accessToken, refreshToken })
                 }
             }
 
-            response.status(401).send({ error: 'Login or password is incorrect!' })
+            return response.status(401).send({ error: 'Login or password is incorrect!' })
         } catch (e: any) {
-            response.status(500).send({ error: e })
+            return response.status(500).send({ error: 'Internal server error' })
         }
     }
 
@@ -104,13 +104,13 @@ class UserController implements IUserController {
                 if (tokens) {
                     const { accessToken, refreshToken } = tokens
 
-                    response.send({ accessToken, refreshToken })
+                    return response.send({ accessToken, refreshToken })
                 }
             }
 
-            response.status(401).send({ error: 'Invalid credentials' })
+            return response.status(401).send({ error: 'Invalid credentials' })
         } catch (e) {
-            response.status(500).send({ error: e })
+            return response.status(500).send({ error: 'Internal server error' })
         }
     }
 }

diff --git a/src/core/swagger.json b/src/core/swagger.json
@@ -366,13 +366,29 @@
             "get": {
                 "description": "Список карточек",
                 "tags": ["cards"],
+                "parameters": [
+                    {
+                        "name": "limit",
+                        "in": "query",
+                        "required": true,
+                        "type": "number",
+                        "example": 2
+                    },
+                    {
+                        "name": "offset",
+                        "in": "query",
+                        "required": true,
+                        "type": "number",
+                        "example": 20
+                    }
+                ],
                 "responses": {
                     "200": {
                         "name": "obj",
                         "in": "body",
                         "description": "Список карточек",
                         "schema": {
-                            "$ref": "#/definitions/CardsResponse"
+                            "$ref": "#/definitions/PaginatedCardsResponse"
                         }
                     }
                 }
@@ -938,6 +954,25 @@
                 }
             }
         },
+        "PaginatedCardsResponse": {
+            "type": "object",
+            "properties": {
+                "total": {
+                    "type": "number",
+                    "example": 2200
+                },
+                "hasNextPage": {
+                    "type": "boolean",
+                    "example": true
+                },
+                "results": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/CardsResponse"
+                    }
+                }
+            }
+        },
         "CardData": {
             "type": "object",
             "properties": {

diff --git a/src/migrations/20220620145536-filled-property-delete-field-name.js b/src/migrations/20220620145536-filled-property-delete-field-name.js
@@ -0,0 +1,14 @@
+'use strict';
+
+module.exports = {
+  async up (queryInterface, Sequelize) {
+    await queryInterface.removeColumn('FilledProperties', 'name')
+  },
+
+  async down (queryInterface, Sequelize) {
+    await queryInterface.addColumn('FilledProperties', 'name', {
+        type: Sequelize.STRING,
+        allowNull: false
+    })
+  }
+};