Добавляет префикс "restapi" для импорта (#25)

* [fix] Fix geo property creating error * [fix] Add prefix for csv import * fix: migrations in dev build * [feat] Add API_PREFIX env variable * [ref] Use separated file for API_PREFIX * fix: api prefix in build Co-authored-by: dice4x4 <[email protected]>
dh-center · Jul 6, 2022 · 80da033 · 80da033
1 parent 2c15caf
commit 80da033
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 4 deletions.
diff --git a/.env b/.env
@@ -7,3 +7,4 @@ DB_DIALECT=postgres
 SERVER_PORT=8000
 ACCESS_TOKEN_LIFETIME=300000
 REFRESH_TOKEN_LIFETIME=3600000
+API_PREFIX=/restapi/v1
diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
@@ -26,6 +26,7 @@ env:
   SERVER_PORT: 8000
   ACCESS_TOKEN_LIFETIME: 300000
   REFRESH_TOKEN_LIFETIME: 3600000
+  API_PREFIX: /restapi/v1
 
 jobs:
   deploy:
@@ -80,6 +81,7 @@ jobs:
               -e POSTGRES_DB=${{ env.POSTGRES_DB }} \
               -e DB_PORT=${{ env.DB_PORT }} -e DB_HOST=${{ env.DB_HOST }} \
               -e DB_DIALECT=${{ env.DB_DIALECT }} \
+              -e API_PREFIX=${{ env.API_PREFIX }} \
               -e SERVER_PORT=${{ env.SERVER_PORT }} \
               -e ACCESS_TOKEN_LIFETIME=${{ env.ACCESS_TOKEN_LIFETIME }} \
               -e REFRESH_TOKEN_LIFETIME=${{ env.REFRESH_TOKEN_LIFETIME }} \

diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml
@@ -24,6 +24,7 @@ env:
   POSTGRES_DB: ${{ secrets.POSTGRES_DB_STAGE }}
   DB_PORT: ${{ secrets.DB_PORT_STAGE }}
   DB_HOST: ${{ secrets.DB_HOST_STAGE }}
+  API_PREFIX: /restapi/v1
 
 jobs:
   deploy:
@@ -47,6 +48,7 @@ jobs:
               -e POSTGRES_DB=${{ env.POSTGRES_DB }} \
               -e DB_PORT=${{ env.DB_PORT }} -e DB_HOST=${{ env.DB_HOST }} \
               -e DB_DIALECT=${{ env.DB_DIALECT }} \
+              -e API_PREFIX=${{ env.API_PREFIX }} \
               -e SERVER_PORT=${{ env.SERVER_PORT }} \
               -e ACCESS_TOKEN_LIFETIME=${{ env.ACCESS_TOKEN_LIFETIME }} \
               -e REFRESH_TOKEN_LIFETIME=${{ env.REFRESH_TOKEN_LIFETIME }} \

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -21,3 +21,5 @@ services:
             - 8000:8000
         depends_on:
             - db
+        env_file:
+            - .env
diff --git a/src/admin/components/import-action-component.tsx b/src/admin/components/import-action-component.tsx
@@ -1,11 +1,12 @@
 import React from 'react'
+import { API_PREFIX } from "../../configs/constants"
 
 const ImportAction = () => {
     async function submitForm(form: HTMLFormElement) {
         const formData = new FormData(form)
 
         const response = await fetch(
-            '/v1/admin/import-csv',
+            `${API_PREFIX}/admin/import-csv`,
             {
                 method: 'POST',
                 body: formData

diff --git a/src/configs/constants.ts b/src/configs/constants.ts
@@ -0,0 +1,5 @@
+const API_PREFIX = process.env.API_PREFIX || "/restapi/v1"
+
+export {
+    API_PREFIX
+}
diff --git a/src/core/index.ts b/src/core/index.ts
@@ -31,17 +31,21 @@ import FilledPropertyService from "../services/cards/FilledProperty"
 import GeoPropertyService from "../services/cards/GeoProperty"
 import DateCatalogService from "../services/dates/DateCatalog"
 import OrganizationService from "../services/organizations/Organization"
+import { API_PREFIX } from "../configs/constants"
 
 class App {
     public port: string
 
     readonly app: express.Application
     readonly server: Server
     readonly sequelize: Sequelize
+    readonly apiPrefix: string
 
     constructor(port = '8000') {
         this.port = process.env.SERVER_PORT || port
 
+        this.apiPrefix = API_PREFIX
+
         this.app = this.createApp()
         this.server = createServer(this.app)
         this.sequelize = sequelize
@@ -53,7 +57,7 @@ class App {
         app.use(cors())
         app.use(bodyParser.json())
         app.use(passport.initialize())
-        app.use('/v1', getRouter(this.provideControllers()))
+        app.use(`${this.apiPrefix}/`, getRouter(this.provideControllers()))
         app.use('/admin', adminRoutes)
         if (process.env.NODE_ENV != 'production') {
             app.use('/swagger', docsRoutes)

diff --git a/src/routes/v1/cards/CsvImport.ts b/src/routes/v1/cards/CsvImport.ts
@@ -4,7 +4,6 @@ import { parse } from "csv-parse/sync"
 import fs from "fs"
 import Card, { FilledPropertyCard } from "../../../models/cards/Card"
 import FilledProperty from "../../../models/cards/FilledProperty"
-import GeoProperty from "../../../models/cards/GeoProperty"
 import Property from "../../../models/cards/Property"
 
 class JulianDate {

diff --git a/tsconfig.json b/tsconfig.json
@@ -8,6 +8,7 @@
       "strictPropertyInitialization": false,
       "experimentalDecorators": true,
       "emitDecoratorMetadata": true,
-      "jsx": "react"
+      "jsx": "react",
+      "allowJs": true
     }
 }