Update typeorm

.gitignore

@@ -10,3 +10,4 @@
 # production
 **/build
 **/npm-debug.log*
+.idea

api/package.json

@@ -19,10 +19,10 @@
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.15",
     "module-alias": "^2.2.2",
-    "pg": "^7.14.0",
+    "pg": "^8.7.3",
     "reflect-metadata": "^0.1.13",
     "striptags": "^3.1.1",
-    "typeorm": "^0.2.20"
+    "typeorm": "^0.3.7"
   },
   "devDependencies": {
     "@types/cors": "^2.8.6",
@@ -43,7 +43,7 @@
     "lint-staged": "^9.4.3",
     "nodemon": "^2.0.0",
     "prettier": "^1.19.1",
-    "ts-node": "^8.5.2",
+    "ts-node": "^10.8.2",
     "tsconfig-paths": "^3.9.0",
     "typescript": "^3.7.2"
   },

api/src/controllers/issues.ts

@@ -21,7 +21,8 @@ export const getProjectIssues = catchErrors(async (req, res) => {
 });
 
 export const getIssueWithUsersAndComments = catchErrors(async (req, res) => {
-  const issue = await findEntityOrThrow(Issue, req.params.issueId, {
+  const issue = await findEntityOrThrow(Issue, {
+    where: { id: req.params.issueId },
     relations: ['users', 'comments', 'comments.user'],
   });
   res.respond({ issue });
@@ -44,7 +45,7 @@ export const remove = catchErrors(async (req, res) => {
 });
 
 const calculateListPosition = async ({ projectId, status }: Issue): Promise<number> => {
-  const issues = await Issue.find({ projectId, status });
+  const issues = await Issue.find({ select: { id: projectId, status } });
 
   const listPositions = issues.map(({ listPosition }) => listPosition);
 

api/src/controllers/projects.ts

@@ -4,7 +4,10 @@ import { findEntityOrThrow, updateEntity } from 'utils/typeorm';
 import { issuePartial } from 'serializers/issues';
 
 export const getProjectWithUsersAndIssues = catchErrors(async (req, res) => {
-  const project = await findEntityOrThrow(Project, req.currentUser.projectId, {
+  const project = await findEntityOrThrow(Project, {
+    where: {
+      id: req.currentUser.projectId,
+    },
     relations: ['users', 'issues'],
   });
   res.respond({

api/src/database/createConnection.ts

@@ -1,9 +1,9 @@
-import { createConnection, Connection } from 'typeorm';
+import { DataSource } from 'typeorm';
 
 import * as entities from 'entities';
 
-const createDatabaseConnection = (): Promise<Connection> =>
-  createConnection({
+const createDatabaseConnection = (): Promise<DataSource> =>
+  new DataSource({
     type: 'postgres',
     host: process.env.DB_HOST,
     port: Number(process.env.DB_PORT),
@@ -12,6 +12,6 @@ const createDatabaseConnection = (): Promise<Connection> =>
     database: process.env.DB_DATABASE,
     entities: Object.values(entities),
     synchronize: true,
-  });
+  }).initialize();
 
 export default createDatabaseConnection;

api/src/index.ts

@@ -38,7 +38,9 @@ const initializeExpress = (): void => {
   app.use((req, _res, next) => next(new RouteNotFoundError(req.originalUrl)));
   app.use(handleError);
 
-  app.listen(process.env.PORT || 3000);
+  app.listen(process.env.PORT || 3000, () => {
+    console.log('Server start');
+  });
 };
 
 const initializeApp = async (): Promise<void> => {

api/src/middleware/authentication.ts

@@ -13,7 +13,7 @@ export const authenticateUser = catchErrors(async (req, _res, next) => {
   if (!userId) {
     throw new InvalidTokenError('Authentication token is invalid.');
   }
-  const user = await User.findOne(userId);
+  const user = await User.findOne({ where: { id: userId } });
   if (!user) {
     throw new InvalidTokenError('Authentication token is invalid: User not found.');
   }

api/src/utils/typeorm.ts

@@ -11,10 +11,9 @@ const entities: { [key: string]: EntityConstructor } = { Comment, Issue, Project
 
 export const findEntityOrThrow = async <T extends EntityConstructor>(
   Constructor: T,
-  id: number | string,
-  options?: FindOneOptions,
+  options: FindOneOptions,
 ): Promise<InstanceType<T>> => {
-  const instance = await Constructor.findOne(id, options);
+  const instance = await Constructor.findOne(options);
   if (!instance) {
     throw new EntityNotFoundError(Constructor.name);
   }
@@ -47,7 +46,7 @@ export const updateEntity = async <T extends EntityConstructor>(
   id: number | string,
   input: Partial<InstanceType<T>>,
 ): Promise<InstanceType<T>> => {
-  const instance = await findEntityOrThrow(Constructor, id);
+  const instance = await findEntityOrThrow(Constructor, { where: { id } });
   Object.assign(instance, input);
   return validateAndSaveEntity(instance);
 };
@@ -56,7 +55,7 @@ export const deleteEntity = async <T extends EntityConstructor>(
   Constructor: T,
   id: number | string,
 ): Promise<InstanceType<T>> => {
-  const instance = await findEntityOrThrow(Constructor, id);
+  const instance = await findEntityOrThrow(Constructor, { where: { id } });
   await instance.remove();
   return instance;
 };