forked from ustaxcourt/ef-cms
-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'staging' into 10556-bug
- Loading branch information
Showing
66 changed files
with
1,358 additions
and
923 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ terraform { | |
| } | ||
|
|
||
| required_providers { | ||
| aws = "5.74.0" | ||
| aws = "5.75.1" | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ terraform { | |
| } | ||
|
|
||
| required_providers { | ||
| aws = "5.74.0" | ||
| aws = "5.75.1" | ||
| } | ||
| } | ||
|
|
||
|
|
||
14 changes: 14 additions & 0 deletions
14
shared/src/business/entities/trialSessions/SpecialTrialSessions.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| export type SpecialTrialSession = { | ||
| userId: string; | ||
| trialSessionId: string; | ||
| }; | ||
|
|
||
| export type SpecialTrialSessionKey = { | ||
| pk: string; | ||
| sk: string; | ||
| }; | ||
|
|
||
| export type TrialSessionWorkingCopyNotes = { | ||
| sessionNotes: string; | ||
| trialSessionId: string; | ||
| }; |
19 changes: 19 additions & 0 deletions
19
shared/src/proxies/trialSessions/getBulkSpecialTrialSessionCopyNotesProxy.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| import { | ||
| SpecialTrialSession, | ||
| TrialSessionWorkingCopyNotes, | ||
| } from '@shared/business/entities/trialSessions/SpecialTrialSessions'; | ||
| import { post } from '../requests'; | ||
|
|
||
| export const getBulkSpecialTrialSessionCopyNotesInteractor = ( | ||
| applicationContext, | ||
| { | ||
| specialTrialSessions, | ||
| }: { | ||
| specialTrialSessions: Array<SpecialTrialSession>; | ||
| }, | ||
| ): Array<TrialSessionWorkingCopyNotes> => | ||
| post({ | ||
| applicationContext, | ||
| body: { specialTrialSessions }, | ||
| endpoint: '/trial-sessions/bulk-copy-notes', | ||
| }); |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
web-api/src/business/useCases/trialSessions/getBulkTrialSessionCopyNotesInteractor.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| import { UnauthorizedError } from '@web-api/errors/errors'; | ||
| import { applicationContext } from '../../../../../shared/src/business/test/createTestApplicationContext'; | ||
| import { getBulkTrialSessionCopyNotesInteractor } from './getBulkTrialSessionCopyNotesInteractor'; | ||
| import { mockAdminUser, mockJudgeUser } from '@shared/test/mockAuthUsers'; | ||
|
|
||
| const MOCK_WORKING_COPY_NOTES = [ | ||
| { | ||
| sessionNotes: 'Test notes', | ||
| trialSessionId: '123', | ||
| }, | ||
| { | ||
| sessionNotes: 'Test notes 2', | ||
| trialSessionId: '456', | ||
| }, | ||
| ]; | ||
| describe('getBulkTrialSessionCopyNotesInteractor', () => { | ||
| beforeEach(() => { | ||
| applicationContext | ||
| .getPersistenceGateway() | ||
| .getBulkTrialSessionWorkingCopyNotes.mockReturnValue( | ||
| MOCK_WORKING_COPY_NOTES, | ||
| ); | ||
| }); | ||
| it('should throw an error if the user is unauthorized', async () => { | ||
| await expect( | ||
| getBulkTrialSessionCopyNotesInteractor( | ||
| applicationContext, | ||
| { specialTrialSessions: [] }, | ||
| mockAdminUser, | ||
| ), | ||
| ).rejects.toThrow(UnauthorizedError); | ||
| }); | ||
|
|
||
| it('should return session notes for multiple trial sessions', async () => { | ||
| const result = await getBulkTrialSessionCopyNotesInteractor( | ||
| applicationContext, | ||
| { | ||
| specialTrialSessions: [ | ||
| { trialSessionId: '123', userId: '123' }, | ||
| { trialSessionId: '456', userId: '456' }, | ||
| ], | ||
| }, | ||
| mockJudgeUser, | ||
| ); | ||
| expect(result).toEqual(MOCK_WORKING_COPY_NOTES); | ||
| }); | ||
| }); |
37 changes: 37 additions & 0 deletions
37
web-api/src/business/useCases/trialSessions/getBulkTrialSessionCopyNotesInteractor.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| import { | ||
| ROLE_PERMISSIONS, | ||
| isAuthorized, | ||
| } from '../../../../../shared/src/authorization/authorizationClientService'; | ||
| import { ServerApplicationContext } from '@web-api/applicationContext'; | ||
| import { | ||
| SpecialTrialSession, | ||
| SpecialTrialSessionKey, | ||
| TrialSessionWorkingCopyNotes, | ||
| } from '@shared/business/entities/trialSessions/SpecialTrialSessions'; | ||
| import { UnauthorizedError } from '@web-api/errors/errors'; | ||
| import { UnknownAuthUser } from '@shared/business/entities/authUser/AuthUser'; | ||
|
|
||
| export const getBulkTrialSessionCopyNotesInteractor = async ( | ||
| applicationContext: ServerApplicationContext, | ||
| { specialTrialSessions }: { specialTrialSessions: SpecialTrialSession[] }, | ||
| authorizedUser: UnknownAuthUser, | ||
| ): Promise<Array<TrialSessionWorkingCopyNotes>> => { | ||
| if (!isAuthorized(authorizedUser, ROLE_PERMISSIONS.TRIAL_SESSIONS)) { | ||
| throw new UnauthorizedError('Unauthorized'); | ||
| } | ||
|
|
||
| const specialTrialSessionKeys: Array<SpecialTrialSessionKey> = | ||
| specialTrialSessions.map( | ||
| (t: SpecialTrialSession): SpecialTrialSessionKey => ({ | ||
| pk: `trial-session-working-copy|${t.trialSessionId}`, | ||
| sk: `user|${t.userId}`, | ||
| }), | ||
| ); | ||
|
|
||
| return await applicationContext | ||
| .getPersistenceGateway() | ||
| .getBulkTrialSessionWorkingCopyNotes({ | ||
| applicationContext, | ||
| specialTrialSessions: specialTrialSessionKeys, | ||
| }); | ||
| }; |
Oops, something went wrong.