refactor:

BREAKING CHANGE: polaris types

package.json

@@ -61,9 +61,9 @@
         "@enigmatis/polaris-common": "^1.1.1",
         "@enigmatis/polaris-graphql-logger": "^1.4.1",
         "@enigmatis/polaris-logs": "^2.8.1",
-        "@enigmatis/polaris-middlewares": "^1.3.1",
+        "@enigmatis/polaris-middlewares": "^1.3.2",
         "@enigmatis/polaris-schema": "^1.0.6",
-        "@enigmatis/polaris-typeorm": "^1.1.15",
+        "@enigmatis/polaris-typeorm": "^2.0.0",
         "apollo-server-express": "^2.10.1",
         "apollo-server-plugin-base": "^0.6.10",
         "deepmerge": "^4.2.2",

src/config/polaris-server-config.ts

@@ -4,7 +4,7 @@ import {
     ApplicationProperties,
     LoggerConfiguration,
 } from '@enigmatis/polaris-logs';
-import { Connection } from '@enigmatis/polaris-typeorm';
+import { PolarisConnection } from '@enigmatis/polaris-typeorm';
 import { ApolloServerExpressConfig } from 'apollo-server-express';
 import { DocumentNode } from 'graphql';
 import { IResolvers } from 'graphql-tools';
@@ -21,6 +21,6 @@ export interface PolarisServerConfig extends ApolloServerExpressConfig {
     allowSubscription: boolean;
     customMiddlewares?: any[];
     customContext?: (context: ExpressContext) => any;
-    connection?: Connection;
+    connection?: PolarisConnection;
     supportedRealities?: RealitiesHolder;
 }

src/config/polaris-server-options.ts

@@ -1,7 +1,7 @@
 import { RealitiesHolder } from '@enigmatis/polaris-common';
 import { PolarisGraphQLLogger } from '@enigmatis/polaris-graphql-logger';
 import { ApplicationProperties, LoggerConfiguration } from '@enigmatis/polaris-logs';
-import { Connection } from '@enigmatis/polaris-typeorm';
+import { PolarisConnection } from '@enigmatis/polaris-typeorm';
 import { ApolloServerExpressConfig } from 'apollo-server-express';
 import { DocumentNode } from 'graphql';
 import { IResolvers } from 'graphql-tools';
@@ -17,6 +17,6 @@ export interface PolarisServerOptions extends ApolloServerExpressConfig {
     allowSubscription?: boolean;
     customMiddlewares?: any[];
     customContext?: (context: ExpressContext) => any;
-    connection?: Connection;
+    connection?: PolarisConnection;
     supportedRealities?: RealitiesHolder;
 }

src/middlewares/middlewares-map.ts

@@ -6,12 +6,12 @@ import {
     RealitiesMiddleware,
     SoftDeleteMiddleware,
 } from '@enigmatis/polaris-middlewares';
-import { Connection } from '@enigmatis/polaris-typeorm';
+import { PolarisConnection } from '@enigmatis/polaris-typeorm';
 
 export const getMiddlewaresMap = (
     logger: PolarisGraphQLLogger,
     realitiesHolder: RealitiesHolder,
-    connection?: Connection,
+    connection?: PolarisConnection,
 ): Map<string, any[]> => {
     const softDeleteMiddleware = new SoftDeleteMiddleware(logger).getMiddleware();
     const realitiesMiddleware = new RealitiesMiddleware(logger, realitiesHolder).getMiddleware();

test/integration-tests-without-connection/server/polaris-properties.json

@@ -1,5 +1,5 @@
 {
-    "port": 8082,
+    "port": 8080,
     "id": "p0laris-s33d",
     "name": "polaris-seed",
     "version": "v1",

test/integration-tests/test-server/dal/author.ts

@@ -1,4 +1,10 @@
-import { Column, CommonModel, Entity, OneToMany } from '@enigmatis/polaris-typeorm';
+import {
+    Column,
+    CommonModel,
+    Entity,
+    OneToMany,
+    PrimaryGeneratedColumn,
+} from '@enigmatis/polaris-typeorm';
 import { Book } from './book';
 
 @Entity()
@@ -14,16 +20,17 @@ export class Author extends CommonModel {
         book => book.author,
     )
     public books: Book[] | undefined;
+
+    @PrimaryGeneratedColumn()
+    protected id!: string;
+
     constructor(firstName: string, lastName: string) {
         super();
         this.firstName = firstName;
         this.lastName = lastName;
     }
-    public getBooks(): Book[] | undefined {
-        return this.books;
-    }
 
-    public setBooks(value: Book[]) {
-        this.books = value;
+    public getId(): string {
+        return this.id;
     }
 }

test/integration-tests/test-server/dal/book.ts

@@ -1,4 +1,10 @@
-import { Column, CommonModel, Entity, ManyToOne } from '@enigmatis/polaris-typeorm';
+import {
+    Column,
+    CommonModel,
+    Entity,
+    ManyToOne,
+    PrimaryGeneratedColumn,
+} from '@enigmatis/polaris-typeorm';
 import { Author } from './author';
 
 @Entity()
@@ -12,9 +18,16 @@ export class Book extends CommonModel {
     )
     public author: Author;
 
+    @PrimaryGeneratedColumn('uuid')
+    protected id!: string;
+
     constructor(title: string, author: Author) {
         super();
         this.title = title;
         this.author = author;
     }
+
+    public getId(): string {
+        return this.id;
+    }
 }

test/integration-tests/test-server/data-initalizer.ts

@@ -1,9 +1,9 @@
-import { getConnectionManager, PolarisSaveOptions } from '@enigmatis/polaris-typeorm';
+import { getPolarisConnectionManager } from '@enigmatis/polaris-typeorm';
 import { Author } from './dal/author';
 import { Book } from './dal/book';
 
 export async function deleteTables() {
-    const connection = getConnectionManager().get();
+    const connection = getPolarisConnectionManager().get();
     const tables = ['book', 'author', 'dataVersion'];
     for (const table of tables) {
         if (connection) {
@@ -27,26 +27,26 @@ function getBooks(authors: Author[]): Book[] {
 }
 
 async function createExampleData(authors: Author[], books: Book[]) {
-    const connection = getConnectionManager().get();
+    const connection = getPolarisConnectionManager().get();
     const authorRepo = connection.getRepository(Author);
     const bookRepo = connection.getRepository(Book);
     const context = {
         requestHeaders: { realityId: 0 },
         returnedExtensions: {},
     } as any;
-    await authorRepo.save(new PolarisSaveOptions(authors, context) as any);
-    await bookRepo.save(new PolarisSaveOptions([books[0], books[1]], context) as any);
+    await authorRepo.save(context, authors);
+    await bookRepo.save(context, [books[0], books[1]]);
     context.requestHeaders.realityId = 3;
     delete context.returnedExtensions.globalDataVersion;
-    await bookRepo.save(new PolarisSaveOptions(books[2], context) as any);
+    await bookRepo.save(context, books[2]);
     delete context.returnedExtensions.globalDataVersion;
-    await bookRepo.save(new PolarisSaveOptions(books[3], context) as any);
+    await bookRepo.save(context, books[3]);
     books[4].setDeleted(true);
-    await bookRepo.save(new PolarisSaveOptions(books[4], context) as any);
+    await bookRepo.save(context, books[4]);
 }
 
 export async function initializeDatabase() {
-    const connection = getConnectionManager().get();
+    const connection = getPolarisConnectionManager().get();
     await deleteTables();
     await connection.synchronize();
     const authors: Author[] = getAuthors();

test/integration-tests/test-server/main.ts

@@ -1,4 +1,4 @@
-import { getConnectionManager } from '@enigmatis/polaris-typeorm';
+import { getPolarisConnectionManager } from '@enigmatis/polaris-typeorm';
 import { PolarisServer } from '../../../src';
 import { initConnection } from './connection-manager';
 import { initializeDatabase } from './data-initalizer';
@@ -17,7 +17,7 @@ const startApp = async () => {
         resolvers,
         port: polarisProperties.port,
         logger: polarisGraphQLLogger,
-        connection: getConnectionManager().get(),
+        connection: getPolarisConnectionManager().get(),
     });
     await server.start();
 };

test/integration-tests/test-server/polaris-properties.json

@@ -1,5 +1,5 @@
 {
-    "port": 8082,
+    "port": 8080,
     "id": "p0laris-ex5mpl3",
     "name": "polaris-example",
     "version": "v1",

test/integration-tests/test-server/schema/resolvers.ts

@@ -1,13 +1,5 @@
 import { PolarisGraphQLContext } from '@enigmatis/polaris-common';
-import {
-    DeleteResult,
-    getConnectionManager,
-    Like,
-    PolarisCriteria,
-    PolarisFindManyOptions,
-    PolarisFindOneOptions,
-    PolarisSaveOptions,
-} from '../../../../src/index';
+import { DeleteResult, getPolarisConnectionManager, Like } from '../../../../src/index';
 import { Author } from '../dal/author';
 import { Book } from '../dal/book';
 import { polarisGraphQLLogger } from '../logger';
@@ -19,48 +11,36 @@ export const resolvers = {
             args: any,
             context: PolarisGraphQLContext,
         ): Promise<Book[]> => {
-            const connection = getConnectionManager().get();
+            const connection = getPolarisConnectionManager().get();
             polarisGraphQLLogger.debug("I'm the resolver of all books", context);
-            return connection
-                .getRepository(Book)
-                .find(new PolarisFindManyOptions({ relations: ['author'] }, context) as any);
+            return connection.getRepository(Book).find(context, { relations: ['author'] });
         },
         bookByTitle: (parent: any, args: any, context: PolarisGraphQLContext): Promise<Book[]> => {
-            const connection = getConnectionManager().get();
-            return connection.getRepository(Book).find(
-                new PolarisFindManyOptions(
-                    {
-                        where: { title: Like(`%${args.title}%`) },
-                        relations: ['author'],
-                    },
-                    context,
-                ) as any,
-            );
+            const connection = getPolarisConnectionManager().get();
+            return connection.getRepository(Book).find(context, {
+                where: { title: Like(`%${args.title}%`) },
+                relations: ['author'],
+            });
         },
         authorsByName: async (
             parent: any,
             args: any,
             context: PolarisGraphQLContext,
         ): Promise<Author[]> => {
-            const connection = getConnectionManager().get();
-            return connection.getRepository(Author).find(
-                new PolarisFindManyOptions(
-                    {
-                        where: { firstName: Like(`%${args.name}%`) },
-                    },
-                    context,
-                ) as any,
-            );
+            const connection = getPolarisConnectionManager().get();
+            return connection
+                .getRepository(Author)
+                .find(context, { where: { firstName: Like(`%${args.name}%`) } });
         },
         authorById: async (
             parent: any,
             args: any,
             context: PolarisGraphQLContext,
         ): Promise<Author | undefined> => {
-            const connection = getConnectionManager().get();
+            const connection = getPolarisConnectionManager().get();
             return connection
                 .getRepository(Author)
-                .findOne(new PolarisFindOneOptions({ where: { id: args.id } }, context) as any, {});
+                .findOne(context, { where: { id: args.id } }, {});
         },
     },
     Mutation: {
@@ -69,25 +49,25 @@ export const resolvers = {
             args: any,
             context: PolarisGraphQLContext,
         ): Promise<Author> => {
-            const connection = getConnectionManager().get();
+            const connection = getPolarisConnectionManager().get();
             const authorRepo = connection.getRepository(Author);
             const newAuthor = new Author(args.firstName, args.lastName);
-            await authorRepo.save(new PolarisSaveOptions(newAuthor, context) as any);
+            await authorRepo.save(context, newAuthor);
             return newAuthor;
         },
         updateBook: async (
             parent: any,
             args: any,
             context: PolarisGraphQLContext,
         ): Promise<Book | undefined> => {
-            const connection = getConnectionManager().get();
+            const connection = getPolarisConnectionManager().get();
             const bookRepo = connection.getRepository(Book);
-            const result = await bookRepo.find({ where: { title: Like(`%${args.title}%`) } });
+            const result = await bookRepo.find(context, {
+                where: { title: Like(`%${args.title}%`) },
+            });
             const bookToUpdate = result.length > 0 ? result[0] : undefined;
             if (bookToUpdate) {
-                await bookRepo.update(new PolarisFindOneOptions(bookToUpdate, context) as any, {
-                    title: args.newTitle,
-                });
+                await bookRepo.update(context, { title: args.newTitle }, bookToUpdate);
             }
             return bookToUpdate;
         },
@@ -96,11 +76,9 @@ export const resolvers = {
             args: any,
             context: PolarisGraphQLContext,
         ): Promise<boolean> => {
-            const connection = getConnectionManager().get();
+            const connection = getPolarisConnectionManager().get();
             const bookRepo = connection.getRepository(Book);
-            const result: DeleteResult = await bookRepo.delete(
-                new PolarisCriteria(args.id, context) as any,
-            );
+            const result: DeleteResult = await bookRepo.delete(context, args.id);
             return (
                 result &&
                 result.affected !== null &&
@@ -113,11 +91,9 @@ export const resolvers = {
             args: any,
             context: PolarisGraphQLContext,
         ): Promise<boolean> => {
-            const connection = getConnectionManager().get();
+            const connection = getPolarisConnectionManager().get();
             const authorRepos = connection.getRepository(Author);
-            await authorRepos.delete(
-                new PolarisCriteria({ where: { id: args.id } }, context) as any,
-            );
+            await authorRepos.delete(context, args.id);
             return true;
         },
     },

test/integration-tests/test-server/test-server.ts

@@ -1,5 +1,5 @@
 import { RealitiesHolder } from '@enigmatis/polaris-common';
-import { ConnectionOptions, getConnectionManager } from '@enigmatis/polaris-typeorm';
+import { ConnectionOptions, getPolarisConnectionManager } from '@enigmatis/polaris-typeorm';
 import { PolarisServer } from '../../../src';
 import { initConnection } from './connection-manager';
 import { loggerConfig } from './logger';
@@ -26,15 +26,17 @@ export async function startTestServer(): Promise<PolarisServer> {
         supportedRealities: new RealitiesHolder(
             new Map([[3, { id: 3, type: 'notreal3', name: 'default' }]]),
         ),
-        connection: getConnectionManager().get(),
+        connection: getPolarisConnectionManager().get(),
     });
     await server.start();
     return server;
 }
 
 export async function stopTestServer(server: PolarisServer) {
     await server.stop();
-    await getConnectionManager()
-        .get()
-        .close();
+    if (getPolarisConnectionManager().connections.length > 0) {
+        await getPolarisConnectionManager()
+            .get()
+            .close();
+    }
 }

tsconfig.json

@@ -12,7 +12,8 @@
         "allowSyntheticDefaultImports": true,
         "types": ["jest", "ip", "uuid"],
         "declaration": true,
-        "lib": ["es6", "es2017", "esnext", "dom"]
+        "lib": ["es6", "es2017", "esnext", "dom"],
+        "skipLibCheck": true
     },
     "exclude": ["node_modules", "dist"]
 }