Skip to content

Commit 9435010

Browse files
committed
update backend import order see: import-js/eslint-plugin-import#2721
1 parent 745dcf2 commit 9435010

File tree

151 files changed

+267
-267
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+267
-267
lines changed

apps/backend/src/asyncJobs/AsyncJobs.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
import 'reflect-metadata';
33
import sinon from 'sinon';
44

5-
import { CallDataSourceMock } from '../datasources/mockups/CallDataSource';
65
import checkCallsEndedJob from './jobs/checkAllCallsEnded';
76
import checkCallsFAPReviewEndedJob from './jobs/checkCallsFAPReviewEnded';
87
import checkCallsReviewEndedJob from './jobs/checkCallsReviewEnded';
98
import { runAsyncJobs } from './startAsyncJobs';
9+
import { CallDataSourceMock } from '../datasources/mockups/CallDataSource';
1010

1111
describe('Test if predefined async jobs are running correctly', () => {
1212
let clock: sinon.SinonFakeTimers;

apps/backend/src/asyncJobs/jobs/checkInviteReminderJob.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import { faker } from '@faker-js/faker';
33
import sinon from 'sinon';
44
import { container } from 'tsyringe';
55

6+
import checkInviteReminderJob from './checkInviteReminderJob';
67
import { Tokens } from '../../config/Tokens';
78
import { EmailTemplateId } from '../../eventHandlers/email/essEmailHandler';
89
import { Invite } from '../../models/Invite';
910
import { RoleClaim } from '../../models/RoleClaim';
1011
import { SettingsId } from '../../models/Settings';
1112
import { User, UserRole } from '../../models/User';
12-
import checkInviteReminderJob from './checkInviteReminderJob';
1313

1414
const mockUserDataSource = {
1515
getBasicUserInfo: sinon.stub(),

apps/backend/src/asyncJobs/startAsyncJobs.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
import { CronJob } from 'cron';
33
import { container } from 'tsyringe';
44

5+
import ALL_ASYNC_JOBS from './allAsyncJobs';
56
import { Tokens } from '../config/Tokens';
67
import { CallDataSource } from '../datasources/CallDataSource';
7-
import ALL_ASYNC_JOBS from './allAsyncJobs';
88

99
const callDataSource = container.resolve<CallDataSource>(Tokens.CallDataSource);
1010

apps/backend/src/auth/DataAccessUsersAuthorization.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { container } from 'tsyringe';
22

3+
import { DataAccessUsersAuthorization } from './DataAccessUsersAuthorization';
34
import {
45
dummyPrincipalInvestigatorWithRole,
56
dummyUserNotOnProposalWithRole,
67
dummyUserOfficerWithRole,
78
dummyUserWithRole,
89
} from '../datasources/mockups/UserDataSource';
9-
import { DataAccessUsersAuthorization } from './DataAccessUsersAuthorization';
1010

1111
const dataAccessUsersAuth = container.resolve(DataAccessUsersAuthorization);
1212

apps/backend/src/auth/DataAccessUsersAuthorization.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { inject, injectable } from 'tsyringe';
22

3+
import { ProposalAuthorization } from './ProposalAuthorization';
4+
import { UserAuthorization } from './UserAuthorization';
35
import { Tokens } from '../config/Tokens';
46
import { ProposalDataSource } from '../datasources/ProposalDataSource';
57
import { UserWithRole } from '../models/User';
68
import { Proposal } from '../resolvers/types/Proposal';
7-
import { ProposalAuthorization } from './ProposalAuthorization';
8-
import { UserAuthorization } from './UserAuthorization';
99

1010
@injectable()
1111
export class DataAccessUsersAuthorization {

apps/backend/src/auth/ExperimentSafetyAuthorization.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { inject, injectable } from 'tsyringe';
22

3+
import { ProposalAuthorization } from './ProposalAuthorization';
4+
import { UserAuthorization } from './UserAuthorization';
35
import { Tokens } from '../config/Tokens';
46
import { ExperimentDataSource } from '../datasources/ExperimentDataSource';
57
import { UserWithRole } from '../models/User';
68
import { ExperimentSafety } from '../resolvers/types/ExperimentSafety';
7-
import { ProposalAuthorization } from './ProposalAuthorization';
8-
import { UserAuthorization } from './UserAuthorization';
99

1010
@injectable()
1111
export class ExperimentSafetyAuthorization {

apps/backend/src/auth/ExperimentSafetyReviewAuthorization.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { inject, injectable } from 'tsyringe';
22

3+
import { ProposalAuthorization } from './ProposalAuthorization';
4+
import { UserAuthorization } from './UserAuthorization';
35
import { Tokens } from '../config/Tokens';
46
import { ReviewDataSource } from '../datasources/ReviewDataSource';
57
import { TechnicalReview } from '../models/TechnicalReview';
68
import { UserWithRole } from '../models/User';
7-
import { ProposalAuthorization } from './ProposalAuthorization';
8-
import { UserAuthorization } from './UserAuthorization';
99

1010
@injectable()
1111
export class ExperimentSafetyReviewAuthorization {

apps/backend/src/auth/OAuthAuthorization.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jest.mock('@user-office-software/openid', () => {
2121
import 'reflect-metadata';
2222
import { container } from 'tsyringe';
2323

24+
import { OAuthAuthorization } from './OAuthAuthorization';
2425
import { Tokens } from '../config/Tokens';
2526
import { AdminDataSource } from '../datasources/AdminDataSource';
2627
import { dummyUser } from '../datasources/mockups/UserDataSource';
2728
import { UserDataSource } from '../datasources/UserDataSource';
2829
import { Institution } from '../models/Institution';
2930
import { User, UserRole } from '../models/User';
30-
import { OAuthAuthorization } from './OAuthAuthorization';
3131

3232
describe('OAuthAuthorization', () => {
3333
let oauthAuthorization: OAuthAuthorization;

apps/backend/src/auth/OAuthAuthorization.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import { GraphQLError } from 'graphql';
99
import { UserinfoResponse } from 'openid-client';
1010
import { container } from 'tsyringe';
1111

12+
import { UserAuthorization } from './UserAuthorization';
1213
import { Tokens } from '../config/Tokens';
1314
import { AdminDataSource } from '../datasources/AdminDataSource';
1415
import { Rejection } from '../models/Rejection';
1516
import { SettingsId } from '../models/Settings';
1617
import { AuthJwtPayload, User, UserRole } from '../models/User';
17-
import { UserAuthorization } from './UserAuthorization';
1818

1919
interface UserinfoResponseWithInssitution extends UserinfoResponse {
2020
institution_ror_id?: string;

apps/backend/src/auth/ProposalAuthorization.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { container } from 'tsyringe';
22

3+
import { ProposalAuthorization } from './ProposalAuthorization';
34
import {
45
dummyFapChairWithRole,
56
dummyFapReviewerWithRole,
@@ -13,7 +14,6 @@ import {
1314
dummyUserWithRole,
1415
dummyVisitorWithRole,
1516
} from '../datasources/mockups/UserDataSource';
16-
import { ProposalAuthorization } from './ProposalAuthorization';
1717

1818
const proposalAuthorization = container.resolve(ProposalAuthorization);
1919

0 commit comments

Comments
 (0)