From 25c14a1e650bfe2aeab3ef42a21a5f9e004959ef Mon Sep 17 00:00:00 2001
From: Alex Ruef <alex.ruef@oregonstate.edu>
Date: Fri, 28 Jul 2023 11:48:23 -0700
Subject: [PATCH] fixed lint issues for new import rules

---
 src/api/announcements.ts                 | 2 +-
 src/api/modules/__tests__/canvas.test.ts | 2 +-
 src/api/modules/cache.ts                 | 2 +-
 src/api/modules/canvas.ts                | 2 +-
 src/logger.ts                            | 4 ++--
 src/utils/auth.ts                        | 2 +-
 src/utils/jestSetup.ts                   | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/api/announcements.ts b/src/api/announcements.ts
index 40d0c866..72069003 100644
--- a/src/api/announcements.ts
+++ b/src/api/announcements.ts
@@ -1,8 +1,8 @@
 /**
  * /api/announcements
  */
-import { Router, Request, Response } from 'express'; // eslint-disable-line no-unused-vars
 import { isNullOrUndefined } from 'util';
+import { Router, Request, Response } from 'express'; // eslint-disable-line no-unused-vars
 import logger from '../logger';
 import { getAnnouncements } from './modules/dx';
 import { asyncTimedFunction } from '../tracer';
diff --git a/src/api/modules/__tests__/canvas.test.ts b/src/api/modules/__tests__/canvas.test.ts
index 9bfe3f24..bfec40a4 100644
--- a/src/api/modules/__tests__/canvas.test.ts
+++ b/src/api/modules/__tests__/canvas.test.ts
@@ -1,7 +1,7 @@
 /* eslint-disable no-unused-vars */
 
-import { rest } from 'msw';
 import querystring from 'querystring';
+import { rest } from 'msw';
 import { server } from '@src/mocks/server';
 import { getPlannerItems, refreshOAuthToken, postRequest, CANVAS_OAUTH_TOKEN_URL } from '../canvas';
 
diff --git a/src/api/modules/cache.ts b/src/api/modules/cache.ts
index abf1dd20..a070c3a3 100644
--- a/src/api/modules/cache.ts
+++ b/src/api/modules/cache.ts
@@ -1,7 +1,7 @@
+import { promisify } from 'util';
 import request from 'node-fetch';
 import redis from 'redis';
 import config from 'config';
-import { promisify } from 'util';
 import logger from '../../logger';
 
 const DEFAULT_DB: number = 1;
diff --git a/src/api/modules/canvas.ts b/src/api/modules/canvas.ts
index 6cb2343b..9589fccb 100644
--- a/src/api/modules/canvas.ts
+++ b/src/api/modules/canvas.ts
@@ -1,6 +1,6 @@
+import querystring from 'querystring';
 import request from 'node-fetch';
 import config from 'config';
-import querystring from 'querystring';
 import { format } from 'date-fns';
 import { utcToZonedTime } from 'date-fns-tz';
 import { Types } from '@osu-wams/lib'; // eslint-disable-line no-unused-vars
diff --git a/src/logger.ts b/src/logger.ts
index fb85c231..3425d482 100644
--- a/src/logger.ts
+++ b/src/logger.ts
@@ -1,7 +1,7 @@
-import winston, { createLogger, format, transports, config as winstonConfig } from 'winston'; // eslint-disable-line no-unused-vars
-import expressWinston, { LoggerOptionsWithTransports } from 'express-winston'; // eslint-disable-line no-unused-vars
 import path from 'path';
 import fs from 'fs';
+import winston, { createLogger, format, transports, config as winstonConfig } from 'winston'; // eslint-disable-line no-unused-vars
+import expressWinston, { LoggerOptionsWithTransports } from 'express-winston'; // eslint-disable-line no-unused-vars
 import config from 'config';
 import { Format } from 'logform'; // eslint-disable-line no-unused-vars
 import { Request, Response, NextFunction } from 'express'; // eslint-disable-line no-unused-vars
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index 41a22041..d9960bdf 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -1,5 +1,5 @@
-import { Request, Response, NextFunction } from 'express'; // eslint-disable-line no-unused-vars
 import crypto from 'crypto';
+import { Request, Response, NextFunction } from 'express'; // eslint-disable-line no-unused-vars
 import jwt from 'jsonwebtoken';
 import { User as UserLib } from '@osu-wams/lib';
 import { ENV, GROUPS, IV_LENGTH } from '../constants';
diff --git a/src/utils/jestSetup.ts b/src/utils/jestSetup.ts
index 7b4c14ba..8dfab863 100644
--- a/src/utils/jestSetup.ts
+++ b/src/utils/jestSetup.ts
@@ -1,4 +1,5 @@
 import { beforeEach, beforeAll, afterEach, afterAll, jest } from '@jest/globals'; // eslint-disable-line
+import redis from 'redis';
 import { server } from '@src/mocks/server';
 import { dynamoDbHandler } from '@src/mocks/handlers';
 import TrendingResource from '@src/api/models/trendingResource';
@@ -7,7 +8,6 @@ import User from '@src/api/models/user';
 import { fromDynamoDb } from '@src/mocks/google/trendingResources';
 import { mockDynamoDbUser } from '@src/api/models/__mocks__/user';
 import { mockDynamoDbFavoriteResource } from '@src/api/models/__mocks__/favoriteResource';
-import redis from 'redis';
 
 jest.mock('redis', () => jest.requireActual('redis-mock'));