From 43fbb5a6f29ec251f8a27938ac3f3f1c01e3e151 Mon Sep 17 00:00:00 2001
From: Trivernis <trivernis@gmail.com>
Date: Mon, 14 Oct 2019 09:37:52 +0200
Subject: [PATCH] Optimized imports

- grouped imports and removed obsolete ones
---
 src/graphql/resolvers.ts      |  5 ++---
 src/lib/models/Group.ts       | 19 +++----------------
 src/lib/models/GroupAdmin.ts  | 14 +-------------
 src/lib/models/GroupMember.ts | 14 +-------------
 4 files changed, 7 insertions(+), 45 deletions(-)

diff --git a/src/graphql/resolvers.ts b/src/graphql/resolvers.ts
index 5b5a40b..7e8cbc4 100644
--- a/src/graphql/resolvers.ts
+++ b/src/graphql/resolvers.ts
@@ -1,12 +1,11 @@
 import {GraphQLError} from "graphql";
 import * as status from "http-status";
 import dataaccess from "../lib/dataaccess";
-import {UserNotFoundError} from "../lib/errors/UserNotFoundError";
-import {Group} from "../lib/models";
-import * as models from "../lib/models";
 import {GroupNotFoundGqlError, NotLoggedInGqlError, PostNotFoundGqlError} from "../lib/errors/graphqlErrors";
+import {UserNotFoundError} from "../lib/errors/UserNotFoundError";
 import globals from "../lib/globals";
 import {InternalEvents} from "../lib/InternalEvents";
+import * as models from "../lib/models";
 import {is} from "../lib/regex";
 
 /**
diff --git a/src/lib/models/Group.ts b/src/lib/models/Group.ts
index 222a971..004ee03 100644
--- a/src/lib/models/Group.ts
+++ b/src/lib/models/Group.ts
@@ -1,17 +1,4 @@
-import * as sqz from "sequelize";
-import {
-    BelongsTo,
-    BelongsToMany,
-    Column,
-    CreatedAt, ForeignKey,
-    HasMany,
-    Model,
-    NotNull,
-    Table,
-    Unique,
-    UpdatedAt,
-} from "sequelize-typescript";
-import {ChatMessage} from "./ChatMessage";
+import {BelongsTo, BelongsToMany, Column, ForeignKey, Model, NotNull, Table,} from "sequelize-typescript";
 import {ChatRoom} from "./ChatRoom";
 import {GroupAdmin} from "./GroupAdmin";
 import {GroupMember} from "./GroupMember";
@@ -20,7 +7,7 @@ import {User} from "./User";
 @Table({underscored: true})
 export class Group extends Model<Group> {
     @NotNull
-    @Column( {allowNull: false})
+    @Column({allowNull: false})
     public name: string;
 
     @NotNull
@@ -53,7 +40,7 @@ export class Group extends Model<Group> {
         return await this.$get("rAdmins") as User[];
     }
 
-    public async members({first, offset}: {first: number, offset: number}): Promise<User[]> {
+    public async members({first, offset}: { first: number, offset: number }): Promise<User[]> {
         const limit = first || 10;
         offset = offset || 0;
         return await this.$get("rMembers", {limit, offset}) as User[];
diff --git a/src/lib/models/GroupAdmin.ts b/src/lib/models/GroupAdmin.ts
index c04c48c..19bd84a 100644
--- a/src/lib/models/GroupAdmin.ts
+++ b/src/lib/models/GroupAdmin.ts
@@ -1,16 +1,4 @@
-import * as sqz from "sequelize";
-import {
-    BelongsTo,
-    BelongsToMany,
-    Column,
-    CreatedAt, ForeignKey,
-    HasMany,
-    Model, Not,
-    NotNull,
-    Table,
-    Unique,
-    UpdatedAt,
-} from "sequelize-typescript";
+import {Column, ForeignKey, Model, NotNull, Table,} from "sequelize-typescript";
 import {Group} from "./Group";
 import {User} from "./User";
 
diff --git a/src/lib/models/GroupMember.ts b/src/lib/models/GroupMember.ts
index f9ba6c4..78c4455 100644
--- a/src/lib/models/GroupMember.ts
+++ b/src/lib/models/GroupMember.ts
@@ -1,16 +1,4 @@
-import * as sqz from "sequelize";
-import {
-    BelongsTo,
-    BelongsToMany,
-    Column,
-    CreatedAt, ForeignKey,
-    HasMany,
-    Model, Not,
-    NotNull,
-    Table,
-    Unique,
-    UpdatedAt,
-} from "sequelize-typescript";
+import {Column, ForeignKey, Model, NotNull, Table,} from "sequelize-typescript";
 import {Group} from "./Group";
 import {User} from "./User";