Skip to content

Commit 167d61d

Browse files
kyle1morelkyle1morel
committed
chore: import ordering
Update a number of files to follow correct import ordering
1 parent 57843d3 commit 167d61d

48 files changed

Lines changed: 153 additions & 134 deletions

Some content is hidden

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

‎app/peachSync.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { syncPeachRecords } from './src/domains/peach.ts';
22
import { sendPermitUpdateNotifications } from './src/domains/permit.ts';
33
import { refreshCodeCaches } from './src/db/codes/cache.ts';
4-
import { unitOfWork } from './src/repositories/unitOfWork.ts';
4+
import { unitOfWork } from './src/db/unitOfWork.ts';
55
import { getLogger } from './src/utils/log.ts';
66
import { state } from './state.ts';
77

‎app/src/controllers/yars.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
import { GroupName, Initiative } from '../utils/enums/application.ts';
88

99
import type { Request, Response } from 'express';
10-
import { LocalContext } from '../types/stuff';
10+
import type { LocalContext } from '../types/stuff';
1111

1212
export const getGroupsController = async (
1313
req: Request<never, never, never, { initiative: Initiative }>,

app/src/repositories/unitOfWork.ts renamed to app/src/db/unitOfWork.ts

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,33 @@
11
import { Prisma } from '@prisma/client';
22

3-
import { UserRepository } from './user';
43
import prisma, { PrismaClientType, PrismaTransactionClient } from '../db/database';
5-
import { ContactRepository } from './contact';
4+
import {
5+
AccessRequestRepository,
6+
ActivityContactRepository,
7+
ActivityRepository,
8+
ContactRepository,
9+
DocumentRepository,
10+
DraftRepository,
11+
ElectrificationProjectRepository,
12+
EnquiryRepository,
13+
GeneralProjectRepository,
14+
GroupRepository,
15+
GroupRolePolicyVwRepository,
16+
HousingProjectRepository,
17+
IdentityProviderRepository,
18+
InitiativeRepository,
19+
NoteHistoryRepository,
20+
NoteRepository,
21+
PermitNoteRepository,
22+
PermitRepository,
23+
PermitTrackingRepository,
24+
PermitTypeRepository,
25+
PolicyAttributeRepository,
26+
SourceSystemKindRepository,
27+
SubjectGroupRepository,
28+
UserRepository
29+
} from '../repositories/index';
630
import { SYSTEM_ID } from '../utils/constants/application';
7-
import { IdentityProviderRepository } from './identityProvider';
8-
import { SubjectGroupRepository } from './yars/subjectGroup';
9-
import { GroupRepository } from './yars/group';
10-
import { InitiativeRepository } from './initiative';
11-
import { GroupRolePolicyVwRepository } from './yars/groupRolePolicyVw';
12-
import { AccessRequestRepository } from './accessRequest';
13-
import { PolicyAttributeRepository } from './yars/policyAttribute';
14-
import { HousingProjectRepository } from './housingProject';
15-
import { PermitRepository } from './permit';
16-
import { ActivityRepository } from './activity';
17-
import { ActivityContactRepository } from './activityContact';
18-
import { DraftRepository } from './draft';
19-
import { PermitTrackingRepository } from './permitTracking';
20-
import { ElectrificationProjectRepository } from './electrificationProject';
21-
import { GeneralProjectRepository } from './generalProject';
22-
import { EnquiryRepository } from './enquiry';
23-
import { DocumentRepository } from './document';
24-
import { NoteRepository } from './note';
25-
import { NoteHistoryRepository } from './noteHistory';
26-
import { PermitTypeRepository } from './permitType';
27-
import { SourceSystemKindRepository } from './sourceSystemKind';
28-
import { PermitNoteRepository } from './permitNote';
2931
import { requestContext } from '../types/context';
3032

3133
/**

‎app/src/domains/accessRequest.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Repositories } from '../repositories/unitOfWork';
21
import { getCorrespondingGlobalGroup } from '../domains/yars';
32
import { GroupName, Initiative } from '../utils/enums/application';
43

4+
import type { Repositories } from '../db/unitOfWork';
55
import type { Group } from '../types';
66

77
export const isUserAdmin = async (

‎app/src/domains/activity.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { v4 as uuidv4 } from 'uuid';
22

3-
import { Repositories } from '../repositories/unitOfWork.ts';
43
import { Initiative } from '../utils/enums/application.ts';
54

5+
import type { Repositories } from '../db/unitOfWork';
66
import type { Activity } from '../types/index.ts';
77

88
/**

‎app/src/domains/activityContact.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import config from 'config';
22

33
import { getProjectByActivityId } from './project';
4-
import { Repositories } from '../repositories/unitOfWork';
54
import { Problem } from '../utils';
65
import { GroupName, Initiative } from '../utils/enums/application';
76
import { ActivityContactRole } from '../utils/enums/projectCommon';
87

8+
import type { Repositories } from '../db/unitOfWork';
99
import type { ActivityContact, Contact, CurrentAuthorization, CurrentContext, ProjectRepositoryKeys } from '../types';
1010

1111
export const getTeamMemberEmailTemplateData = async (

‎app/src/domains/electrificationProject.ts‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
import config from 'config';
22
import { v4 as uuidv4 } from 'uuid';
33

4+
import { createActivity } from './activity';
5+
import { email } from '../external/ches';
6+
import { toTitleCase } from '../utils';
7+
import { Initiative } from '../utils/enums/application';
8+
import { ActivityContactRole, ApplicationStatus, SubmissionType } from '../utils/enums/projectCommon';
9+
import { confirmationTemplateElectrificationSubmission } from '../utils/templates';
10+
11+
import type { Repositories } from '../db/unitOfWork';
412
import type {
513
Contact,
614
CurrentContext,
715
ElectrificationProject,
816
ElectrificationProjectBase,
917
ElectrificationProjectIntake
1018
} from '../types';
11-
import { Initiative } from '../utils/enums/application';
12-
import { toTitleCase } from '../utils';
13-
import { confirmationTemplateElectrificationSubmission } from '../utils/templates';
14-
15-
import { ActivityContactRole, ApplicationStatus, SubmissionType } from '../utils/enums/projectCommon';
16-
import { Repositories } from '../repositories/unitOfWork';
17-
18-
import { email } from '../external/ches';
19-
import { createActivity } from './activity';
2019

2120
/**
2221
* Generates and sends a templated email with the given data

‎app/src/domains/enquiry.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import { v4 as uuidv4 } from 'uuid';
44
import { createActivity } from './activity';
55
import { getProjectByActivityId } from './project';
66
import { email } from '../external/ches';
7-
import { Repositories } from '../repositories/unitOfWork';
87
import { getCurrentUsername } from '../utils';
98
import { ActivityContactRole, ApplicationStatus, SubmissionType } from '../utils/enums/projectCommon';
109
import { confirmationTemplateEnquiry } from '../utils/templates';
1110

11+
import type { Repositories } from '../db/unitOfWork';
1212
import type { ContactBase, CurrentContext, Enquiry, EnquiryBase, EnquiryIntake, ProjectRepositoryKeys } from '../types';
1313

1414
export async function emailEnquiryConfirmation(
@@ -26,7 +26,7 @@ export async function emailEnquiryConfirmation(
2626
// If has permit description convert \n to <br>
2727
if (enquiryDescription.includes('Tracking ID:')) {
2828
const descriptionSplit = enquiryDescription.split('\n\n');
29-
permitDescription = descriptionSplit[0]?.replace(/\n/g, '<br>') + '<br><br>';
29+
permitDescription = descriptionSplit[0]?.replaceAll(/\n/g, '<br>') + '<br><br>';
3030
enquiryDescription = descriptionSplit.slice(1, descriptionSplit.length).join(' ');
3131
}
3232

‎app/src/domains/generalProject.ts‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
import config from 'config';
22
import { v4 as uuidv4 } from 'uuid';
33

4+
import { createActivity } from './activity';
5+
import { PermitStage, PermitState } from '../db/codes/enums';
6+
import { jsonToPrismaInputJson } from '../db/utils/utils';
7+
import { email } from '../external/ches';
8+
import { toTitleCase } from '../utils';
9+
import { BasicResponse, Initiative } from '../utils/enums/application';
10+
import { PermitNeeded } from '../utils/enums/permit';
11+
import { ActivityContactRole, ApplicationStatus, SubmissionType } from '../utils/enums/projectCommon';
12+
import { confirmationTemplateGeneralSubmission } from '../utils/templates';
13+
14+
import type { Repositories } from '../db/unitOfWork';
415
import type {
516
Contact,
617
CurrentContext,
@@ -10,17 +21,7 @@ import type {
1021
Permit,
1122
PermitTrackingBase
1223
} from '../types';
13-
import { BasicResponse, Initiative } from '../utils/enums/application';
14-
import { toTitleCase } from '../utils';
15-
import { confirmationTemplateGeneralSubmission } from '../utils/templates';
16-
import { PermitStage, PermitState } from '../db/codes/enums';
17-
import { PermitNeeded } from '../utils/enums/permit';
18-
import { ActivityContactRole, ApplicationStatus, SubmissionType } from '../utils/enums/projectCommon';
19-
import { Repositories } from '../repositories/unitOfWork';
20-
import { jsonToPrismaInputJson } from '../db/utils/utils';
21-
import { UpsertPermitRequest } from '../types/requests';
22-
import { email } from '../external/ches';
23-
import { createActivity } from './activity';
24+
import type { UpsertPermitRequest } from '../types/requests';
2425

2526
/**
2627
* Generates and sends a templated email with the given data

‎app/src/domains/housingProject.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
import config from 'config';
22
import { v4 as uuidv4 } from 'uuid';
33

4+
import { createActivity } from './activity';
5+
import { PermitStage, PermitState } from '../db/codes/enums';
6+
import { jsonToPrismaInputJson } from '../db/utils/utils';
7+
import { email } from '../external/ches';
8+
import { getCurrentUsername, toTitleCase } from '../utils';
9+
import { BasicResponse, Initiative } from '../utils/enums/application';
410
import { NumResidentialUnits } from '../utils/enums/housing';
11+
import { PermitNeeded } from '../utils/enums/permit';
12+
import { ActivityContactRole, ApplicationStatus, SubmissionType } from '../utils/enums/projectCommon';
13+
import { confirmationTemplateHousingSubmission } from '../utils/templates';
514

15+
import type { Repositories } from '../db/unitOfWork';
616
import type {
717
Contact,
818
CurrentContext,
@@ -12,17 +22,7 @@ import type {
1222
Permit,
1323
PermitTrackingBase
1424
} from '../types';
15-
import { BasicResponse, Initiative } from '../utils/enums/application';
16-
import { getCurrentUsername, toTitleCase } from '../utils';
17-
import { confirmationTemplateHousingSubmission } from '../utils/templates';
18-
import { PermitStage, PermitState } from '../db/codes/enums';
19-
import { PermitNeeded } from '../utils/enums/permit';
20-
import { ActivityContactRole, ApplicationStatus, SubmissionType } from '../utils/enums/projectCommon';
21-
import { Repositories } from '../repositories/unitOfWork';
22-
import { jsonToPrismaInputJson } from '../db/utils/utils';
23-
import { UpsertPermitRequest } from '../types/requests';
24-
import { email } from '../external/ches';
25-
import { createActivity } from './activity';
25+
import type { UpsertPermitRequest } from '../types/requests';
2626

2727
/**
2828
* Assigns a priority level to a housing project based on given criteria

0 commit comments

Comments
 (0)