🚨 Organize TS imports

staart · Aug 4, 2020 · 582e8ef · 582e8ef
1 parent b9e775f
commit 582e8ef
Show file tree

Hide file tree

Showing 22 changed files with 39 additions and 110 deletions.
diff --git a/src/controllers/admin/coupons.ts b/src/controllers/admin/coupons.ts
@@ -2,23 +2,22 @@ import { MISSING_FIELD } from "@staart/errors";
 import { RESOURCE_CREATED, respond } from "@staart/messages";
 import {
   ClassMiddleware,
-  Middleware,
-  Get,
   Delete,
+  Get,
+  Middleware,
   Patch,
   Put,
-  Controller,
   Request,
   Response,
 } from "@staart/server";
 import { Joi } from "@staart/validate";
 import { authHandler, validator } from "../../_staart/helpers/middleware";
 import {
+  deleteCouponForUser,
+  generateCouponForUser,
   getAllCouponsForUser,
   getCouponForUser,
   updateCouponForUser,
-  deleteCouponForUser,
-  generateCouponForUser,
 } from "../../_staart/rest/admin";
 
 @ClassMiddleware(authHandler)

diff --git a/src/controllers/admin/index.ts b/src/controllers/admin/index.ts
@@ -1,21 +1,11 @@
 import { MISSING_FIELD } from "@staart/errors";
-import {
-  ClassMiddleware,
-  Controller,
-  Get,
-  Put,
-  Middleware,
-  Request,
-  Response,
-} from "@staart/server";
-import { authHandler, validator } from "../../_staart/helpers/middleware";
-import { Joi } from "@staart/validate";
+import { ClassMiddleware, Get, Request, Response } from "@staart/server";
+import { authHandler } from "../../_staart/helpers/middleware";
 import {
   getAllGroupForUser,
   getAllUsersForUser,
-  getServerLogsForUser,
-  generateCouponForUser,
   getPaymentEventsForUser,
+  getServerLogsForUser,
 } from "../../_staart/rest/admin";
 
 @ClassMiddleware(authHandler)

diff --git a/src/controllers/auth/index.ts b/src/controllers/auth/index.ts
@@ -5,13 +5,7 @@ import {
   RESOURCE_UPDATED,
   respond,
 } from "@staart/messages";
-import {
-  Controller,
-  Middleware,
-  Post,
-  Request,
-  Response,
-} from "@staart/server";
+import { Middleware, Post, Request, Response } from "@staart/server";
 import { Joi, joiValidate } from "@staart/validate";
 import { verifyToken } from "../../_staart/helpers/jwt";
 import {
@@ -26,11 +20,11 @@ import {
   login,
   login2FA,
   register,
+  resendEmailVerificationWithToken,
   sendPasswordReset,
   updatePassword,
   validateRefreshToken,
   verifyEmail,
-  resendEmailVerificationWithToken,
 } from "../../_staart/rest/auth";
 import { addInvitationCredits } from "../../_staart/rest/user";
 

diff --git a/src/controllers/organizations/_id/api-keys.ts b/src/controllers/organizations/_id/api-keys.ts
@@ -6,7 +6,6 @@ import {
 } from "@staart/messages";
 import {
   ClassMiddleware,
-  Controller,
   Delete,
   Get,
   Middleware,
@@ -18,8 +17,8 @@ import {
 import { Joi, joiValidate } from "@staart/validate";
 import { authHandler, validator } from "../../../_staart/helpers/middleware";
 import {
-  localsToTokenOrKey,
   groupUsernameToId,
+  localsToTokenOrKey,
 } from "../../../_staart/helpers/utils";
 import {
   createApiKeyForUser,

diff --git a/src/controllers/organizations/_id/billing.ts b/src/controllers/organizations/_id/billing.ts
@@ -1,16 +1,9 @@
-import {
-  ClassMiddleware,
-  Controller,
-  Get,
-  Patch,
-  Request,
-  Response,
-} from "@staart/server";
+import { ClassMiddleware, Get, Patch, Request, Response } from "@staart/server";
 import { Joi, joiValidate } from "@staart/validate";
 import { authHandler } from "../../../_staart/helpers/middleware";
 import {
-  localsToTokenOrKey,
   groupUsernameToId,
+  localsToTokenOrKey,
 } from "../../../_staart/helpers/utils";
 import {
   getGroupBillingForUser,

diff --git a/src/controllers/organizations/_id/domains.ts b/src/controllers/organizations/_id/domains.ts
@@ -1,13 +1,11 @@
 import {
   RESOURCE_CREATED,
   RESOURCE_DELETED,
-  RESOURCE_SUCCESS,
   RESOURCE_UPDATED,
   respond,
 } from "@staart/messages";
 import {
   ClassMiddleware,
-  Controller,
   Delete,
   Get,
   Middleware,
@@ -20,8 +18,8 @@ import {
 import { Joi, joiValidate } from "@staart/validate";
 import { authHandler, validator } from "../../../_staart/helpers/middleware";
 import {
-  localsToTokenOrKey,
   groupUsernameToId,
+  localsToTokenOrKey,
 } from "../../../_staart/helpers/utils";
 import {
   createDomainForUser,

diff --git a/src/controllers/organizations/_id/index.ts b/src/controllers/organizations/_id/index.ts
@@ -1,32 +1,23 @@
+import { RESOURCE_DELETED, RESOURCE_UPDATED, respond } from "@staart/messages";
 import {
-  RESOURCE_CREATED,
-  RESOURCE_DELETED,
-  RESOURCE_UPDATED,
-  respond,
-} from "@staart/messages";
-import {
-  ChildControllers,
   ClassMiddleware,
-  Controller,
   Delete,
   Get,
   Middleware,
   Patch,
-  Put,
   Request,
   Response,
 } from "@staart/server";
 import { Joi, joiValidate } from "@staart/validate";
 import { authHandler, validator } from "../../../_staart/helpers/middleware";
 import {
-  localsToTokenOrKey,
   groupUsernameToId,
+  localsToTokenOrKey,
 } from "../../../_staart/helpers/utils";
 import {
   deleteGroupForUser,
   getAllGroupDataForUser,
   getGroupForUser,
-  newGroupForUser,
   updateGroupForUser,
 } from "../../../_staart/rest/group";
 

diff --git a/src/controllers/organizations/_id/invoices.ts b/src/controllers/organizations/_id/invoices.ts
@@ -1,15 +1,9 @@
-import {
-  ClassMiddleware,
-  Controller,
-  Get,
-  Request,
-  Response,
-} from "@staart/server";
+import { ClassMiddleware, Get, Request, Response } from "@staart/server";
 import { Joi, joiValidate } from "@staart/validate";
 import { authHandler } from "../../../_staart/helpers/middleware";
 import {
-  localsToTokenOrKey,
   groupUsernameToId,
+  localsToTokenOrKey,
 } from "../../../_staart/helpers/utils";
 import {
   getGroupInvoiceForUser,

diff --git a/src/controllers/organizations/_id/memberships.ts b/src/controllers/organizations/_id/memberships.ts
@@ -1,3 +1,4 @@
+import { MembershipRole } from "@prisma/client";
 import {
   RESOURCE_CREATED,
   RESOURCE_DELETED,
@@ -6,7 +7,6 @@ import {
 } from "@staart/messages";
 import {
   ClassMiddleware,
-  Controller,
   Delete,
   Get,
   Middleware,
@@ -18,8 +18,8 @@ import {
 import { Joi, joiValidate } from "@staart/validate";
 import { authHandler, validator } from "../../../_staart/helpers/middleware";
 import {
-  localsToTokenOrKey,
   groupUsernameToId,
+  localsToTokenOrKey,
 } from "../../../_staart/helpers/utils";
 import {
   deleteGroupMembershipForUser,
@@ -28,7 +28,6 @@ import {
   inviteMemberToGroup,
   updateGroupMembershipForUser,
 } from "../../../_staart/rest/group";
-import { MembershipRole } from "@prisma/client";
 
 @ClassMiddleware(authHandler)
 export class GroupMembershipsController {

diff --git a/src/controllers/organizations/_id/sources.ts b/src/controllers/organizations/_id/sources.ts
@@ -6,7 +6,6 @@ import {
 } from "@staart/messages";
 import {
   ClassMiddleware,
-  Controller,
   Delete,
   Get,
   Patch,
@@ -17,8 +16,8 @@ import {
 import { Joi, joiValidate } from "@staart/validate";
 import { authHandler } from "../../../_staart/helpers/middleware";
 import {
-  localsToTokenOrKey,
   groupUsernameToId,
+  localsToTokenOrKey,
 } from "../../../_staart/helpers/utils";
 import {
   createGroupSourceForUser,

diff --git a/src/controllers/organizations/_id/subscriptions.ts b/src/controllers/organizations/_id/subscriptions.ts
@@ -1,7 +1,6 @@
 import { RESOURCE_CREATED, RESOURCE_UPDATED, respond } from "@staart/messages";
 import {
   ClassMiddleware,
-  Controller,
   Get,
   Patch,
   Put,
@@ -11,8 +10,8 @@ import {
 import { Joi, joiValidate } from "@staart/validate";
 import { authHandler } from "../../../_staart/helpers/middleware";
 import {
-  localsToTokenOrKey,
   groupUsernameToId,
+  localsToTokenOrKey,
 } from "../../../_staart/helpers/utils";
 import {
   createGroupSubscriptionForUser,

diff --git a/src/controllers/organizations/_id/transactions.ts b/src/controllers/organizations/_id/transactions.ts
@@ -1,21 +1,14 @@
-import {
-  ClassMiddleware,
-  Controller,
-  Get,
-  Request,
-  Response,
-  Put,
-} from "@staart/server";
+import { ClassMiddleware, Get, Put, Request, Response } from "@staart/server";
 import { Joi, joiValidate } from "@staart/validate";
 import { authHandler } from "../../../_staart/helpers/middleware";
 import {
-  localsToTokenOrKey,
   groupUsernameToId,
+  localsToTokenOrKey,
 } from "../../../_staart/helpers/utils";
 import {
+  applyCouponToGroupForUser,
   getGroupTransactionForUser,
   getGroupTransactionsForUser,
-  applyCouponToGroupForUser,
 } from "../../../_staart/rest/group";
 
 @ClassMiddleware(authHandler)

diff --git a/src/controllers/organizations/_id/webhooks.ts b/src/controllers/organizations/_id/webhooks.ts
@@ -6,7 +6,6 @@ import {
 } from "@staart/messages";
 import {
   ClassMiddleware,
-  Controller,
   Delete,
   Get,
   Middleware,
@@ -18,8 +17,8 @@ import {
 import { Joi, joiValidate } from "@staart/validate";
 import { authHandler, validator } from "../../../_staart/helpers/middleware";
 import {
-  localsToTokenOrKey,
   groupUsernameToId,
+  localsToTokenOrKey,
 } from "../../../_staart/helpers/utils";
 import {
   createWebhookForUser,

diff --git a/src/controllers/organizations/index.ts b/src/controllers/organizations/index.ts
@@ -1,17 +1,7 @@
+import { RESOURCE_CREATED, respond } from "@staart/messages";
 import {
-  RESOURCE_CREATED,
-  RESOURCE_DELETED,
-  RESOURCE_UPDATED,
-  respond,
-} from "@staart/messages";
-import {
-  ChildControllers,
   ClassMiddleware,
-  Controller,
-  Delete,
-  Get,
   Middleware,
-  Patch,
   Put,
   Request,
   Response,

diff --git a/src/controllers/users/_id/access-tokens.ts b/src/controllers/users/_id/access-tokens.ts
@@ -6,7 +6,6 @@ import {
 } from "@staart/messages";
 import {
   ClassMiddleware,
-  Controller,
   Delete,
   Get,
   Middleware,

diff --git a/src/controllers/users/_id/emails.ts b/src/controllers/users/_id/emails.ts
@@ -6,7 +6,6 @@ import {
 } from "@staart/messages";
 import {
   ClassMiddleware,
-  Controller,
   Delete,
   Get,
   Post,
@@ -18,11 +17,11 @@ import { Joi, joiValidate } from "@staart/validate";
 import { authHandler } from "../../../_staart/helpers/middleware";
 import { userUsernameToId } from "../../../_staart/helpers/utils";
 import {
-  getAllEmailsForUser,
   addEmailToUserForUser,
+  deleteEmailFromUserForUser,
+  getAllEmailsForUser,
   getEmailForUser,
   resendEmailVerificationForUser,
-  deleteEmailFromUserForUser,
 } from "../../../_staart/rest/user";
 
 @ClassMiddleware(authHandler)

diff --git a/src/controllers/users/_id/identities.ts b/src/controllers/users/_id/identities.ts
@@ -1,12 +1,11 @@
 import {
+  RESOURCE_CREATED,
   RESOURCE_DELETED,
   RESOURCE_SUCCESS,
   respond,
-  RESOURCE_CREATED,
 } from "@staart/messages";
 import {
   ClassMiddleware,
-  Controller,
   Delete,
   Get,
   Post,

diff --git a/src/controllers/users/_id/index.ts b/src/controllers/users/_id/index.ts
@@ -1,8 +1,6 @@
 import { RESOURCE_DELETED, RESOURCE_UPDATED, respond } from "@staart/messages";
 import {
-  ChildControllers,
   ClassMiddleware,
-  Controller,
   Delete,
   Get,
   Middleware,

diff --git a/src/controllers/users/_id/memberships.ts b/src/controllers/users/_id/memberships.ts
@@ -1,7 +1,6 @@
 import { RESOURCE_DELETED, RESOURCE_UPDATED, respond } from "@staart/messages";
 import {
   ClassMiddleware,
-  Controller,
   Delete,
   Get,
   Patch,
@@ -12,9 +11,9 @@ import { Joi, joiValidate } from "@staart/validate";
 import { authHandler } from "../../../_staart/helpers/middleware";
 import { userUsernameToId } from "../../../_staart/helpers/utils";
 import {
-  getMembershipsForUser,
-  getMembershipDetailsForUser,
   deleteMembershipForUser,
+  getMembershipDetailsForUser,
+  getMembershipsForUser,
   updateMembershipForUser,
 } from "../../../_staart/rest/user";