Merge pull request #45 from Enigmatis/upgrade-typeorm

Upgrade typeorm
Enigmatis · Apr 21, 2020 · ecf682e · ecf682e
2 parents 0e64197 + bcfd6de
commit ecf682e
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 25 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -73,8 +73,8 @@
         "@enigmatis/polaris-logs": "^2.8.2",
         "@enigmatis/polaris-middlewares": "^1.3.5",
         "@enigmatis/polaris-schema": "^1.1.0",
-        "@enigmatis/polaris-typeorm": "^2.3.1",
-        "apollo-server-express": "^2.11.0",
+        "@enigmatis/polaris-typeorm": "^2.3.4",
+        "apollo-server-express": "2.11.0",
         "apollo-server-plugin-base": "^0.6.10",
         "express": "^4.17.1",
         "graphql": "^14.6.0",

diff --git a/src/plugins/snapshot/snapshot-listener.ts b/src/plugins/snapshot/snapshot-listener.ts
@@ -1,6 +1,10 @@
 import { PolarisGraphQLContext, RealitiesHolder } from '@enigmatis/polaris-common';
 import { PolarisGraphQLLogger } from '@enigmatis/polaris-graphql-logger';
-import { getConnectionForReality, SnapshotPage } from '@enigmatis/polaris-typeorm';
+import {
+    getConnectionForReality,
+    getPolarisConnectionManager,
+    SnapshotPage,
+} from '@enigmatis/polaris-typeorm';
 import { runHttpQuery } from 'apollo-server-core';
 import { GraphQLOptions } from 'apollo-server-express';
 import {
@@ -60,6 +64,7 @@ export class SnapshotListener implements GraphQLRequestListener<PolarisGraphQLCo
             const snapshotRepository = getConnectionForReality(
                 requestHeaders.realityId!,
                 this.realitiesHolder,
+                getPolarisConnectionManager() as any,
             ).getRepository(SnapshotPage);
             const pagesIds: string[] = [];
 

diff --git a/src/server/polaris-server.ts b/src/server/polaris-server.ts
@@ -16,7 +16,11 @@ import { PolarisGraphQLLogger } from '@enigmatis/polaris-graphql-logger';
 import { AbstractPolarisLogger, LoggerConfiguration } from '@enigmatis/polaris-logs';
 import { PolarisLoggerPlugin } from '@enigmatis/polaris-middlewares';
 import { makeExecutablePolarisSchema } from '@enigmatis/polaris-schema';
-import { getConnectionForReality, SnapshotPage } from '@enigmatis/polaris-typeorm';
+import {
+    getConnectionForReality,
+    getPolarisConnectionManager,
+    SnapshotPage,
+} from '@enigmatis/polaris-typeorm';
 import { ApolloServer, ApolloServerExpressConfig, PlaygroundConfig } from 'apollo-server-express';
 import { ApolloServerPlugin } from 'apollo-server-plugin-base';
 import * as express from 'express';
@@ -77,6 +81,7 @@ export class PolarisServer {
             const snapshotRepository = getConnectionForReality(
                 realityId,
                 this.getSupportedRealities(),
+                getPolarisConnectionManager() as any,
             ).getRepository(SnapshotPage);
             const result = await snapshotRepository.findOne({} as any, id);
             res.send(result?.getData());

diff --git a/src/snapshot/snapshot-cleaner.ts b/src/snapshot/snapshot-cleaner.ts
@@ -1,6 +1,10 @@
 import { RealitiesHolder, Reality } from '@enigmatis/polaris-common';
 import { AbstractPolarisLogger } from '@enigmatis/polaris-logs';
-import { getConnectionForReality, SnapshotPage } from '@enigmatis/polaris-typeorm';
+import {
+    getConnectionForReality,
+    getPolarisConnectionManager,
+    SnapshotPage,
+} from '@enigmatis/polaris-typeorm';
 
 let snapshotCleanerInterval: NodeJS.Timeout;
 
@@ -31,6 +35,7 @@ const deleteOutdatedSnapshotPages = (
         const snapshotRepository = getConnectionForReality(
             reality.id,
             realitiesHolder,
+            getPolarisConnectionManager() as any,
         ).getRepository(SnapshotPage);
         await snapshotRepository.query(`DELETE FROM ${snapshotRepository.metadata.tablePath} 
                                         WHERE EXTRACT(EPOCH FROM (NOW() - "creationTime")) > ${secondsToBeOutdated};`);