0001-BACKEND-FIXES.patch

From 5c80613b38c34a98a662c42997f179ecdf04a19a Mon Sep 17 00:00:00 2001
From: criitch <criitch@yandex.ru>
Date: Wed, 25 Dec 2019 14:09:17 +0300
Subject: [PATCH] BACKEND FIXES

---
 packages/backend/.gitignore                              | 2 ++
 packages/backend/config/base/postgres.js                 | 4 ++--
 packages/backend/package.json                            | 9 ++++-----
 packages/backend/src/app/server/graphql/lib/addSchema.ts | 2 +-
 packages/backend/yarn.lock                               | 4 ----
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/packages/backend/.gitignore b/packages/backend/.gitignore
index 98e214d..034ee6a 100644
--- a/packages/backend/.gitignore
+++ b/packages/backend/.gitignore
@@ -3,3 +3,5 @@ node_modules/
 runtime/
 src/infrastructure/migrations/

+.vscode
+.idea
diff --git a/packages/backend/config/base/postgres.js b/packages/backend/config/base/postgres.js
index f69f3bb..bc88ae8 100644
--- a/packages/backend/config/base/postgres.js
+++ b/packages/backend/config/base/postgres.js
@@ -7,8 +7,8 @@ module.exports = {
     type: "postgres",
     host: "127.0.0.1",
     database: "bank-pamiati-20",
-    username: "gorod",
-    password: "123qwe",
+    username: "postgres",
+    password: "postgres",
     entities: [entitiesDir],
     migrations: [migrationsDir],
   logging: ["error", "query"],
diff --git a/packages/backend/package.json b/packages/backend/package.json
index e1bfef6..d7c8424 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -7,10 +7,10 @@
     "build": "./node_modules/.bin/tsc",
     "cli": "/opt/bank-pamiati-20-backend/current/bin/environment node ./dist/app/bin/cli.js",
     "lint": "./node_modules/.bin/tslint 'src/**/*.ts' --fix",
-    "migrate": "bin/environment typeorm migration:run",
-    "revert": "bin/environment typeorm migration:revert",
-    "migration:new": "bin/environment typeorm migration:generate -n migration -d 'src/infrastructure/migrations'",
-    "serve": "node ./dist/application/bin/app.js"
+    "migrate": "typeorm migration:run",
+    "revert": "typeorm migration:revert",
+    "migration:new": "typeorm migration:generate -n migration -d 'src/infrastructure/migrations'",
+    "serve": "nodemon --delay 2.5 ./dist/app/bin/main-server.js | pino-pretty"
   },
   "dependencies": {
     "@types/axios": "^0.14.0",
@@ -34,7 +34,6 @@
     "bluebird": "^3.5.5",
     "body-parser": "^1.19.0",
     "commander": "^2.20.0",
-    "deployment": "git+ssh://git@github.com/c7s/deployment.git#release-20170605-AA-2769",
     "event-stream": "^4.0.1",
     "express": "^4.17.1",
     "express-session": "^1.16.2",
diff --git a/packages/backend/src/app/server/graphql/lib/addSchema.ts b/packages/backend/src/app/server/graphql/lib/addSchema.ts
index 7ea50ff..1f60013 100644
--- a/packages/backend/src/app/server/graphql/lib/addSchema.ts
+++ b/packages/backend/src/app/server/graphql/lib/addSchema.ts
@@ -26,5 +26,5 @@ export const addSchema = (params: InputParams) => {
       userId: <string>req.headers[DEFAULT_USER_ID_NAME] || null,
     })
   });
-  apollo.applyMiddleware({ app, path, cors: false });
+  apollo.applyMiddleware({ app, path, cors: true });
 };
diff --git a/packages/backend/yarn.lock b/packages/backend/yarn.lock
index 2ab195d..582795b 100644
--- a/packages/backend/yarn.lock
+++ b/packages/backend/yarn.lock
@@ -798,10 +798,6 @@ depd@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"

-"deployment@git+ssh://git@github.com/c7s/deployment.git#release-20170605-AA-2769":
-  version "1.0.0"
-  resolved "git+ssh://git@github.com/c7s/deployment.git#04a3d55385751fb9c1254cd217c046b6cc6db3f5"
-
 deprecated-decorator@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/deprecated-decorator/-/deprecated-decorator-0.1.6.tgz#00966317b7a12fe92f3cc831f7583af329b86c37"
--
2.21.0.windows.1