Skip to content

Commit 733be98

Browse files
Remove superfluous methods
Note that the spy should have been failing, but it was never checked. Refs #3188
1 parent 1f2b0f8 commit 733be98

2 files changed

Lines changed: 1 addition & 43 deletions

File tree

src/Prereviewers/index.ts

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
import { FetchHttpClient } from '@effect/platform'
2-
import { Context, Effect, Layer, pipe, Redacted } from 'effect'
1+
import { Context, Effect, Layer, pipe } from 'effect'
32
import * as Commands from '../Commands.ts'
43
import { UnableToHandleCommand } from '../Commands.ts'
5-
import * as LegacyPrereview from '../legacy-prereview.ts'
64
import * as Queries from '../Queries.ts'
7-
import { FptsToEffect } from '../RefactoringUtilities/index.ts'
85
import { Temporal, type OrcidId } from '../types/index.ts'
96
import { possiblePseudonyms } from '../types/Pseudonym.ts'
107
import { GetAvailablePseudonym } from './GetAvailablePseudonym.ts'
@@ -17,14 +14,10 @@ import { RegisterPrereviewer } from './RegisterPrereviewer.ts'
1714
export class Prereviewers extends Context.Tag('Prereviewers')<
1815
Prereviewers,
1916
{
20-
legacyRegister: (orcidId: OrcidId.OrcidId) => Effect.Effect<void, UnableToHandleCommand>
2117
register: (orcidId: OrcidId.OrcidId) => Effect.Effect<void, UnableToHandleCommand>
2218
isRegistered: Queries.FromOnDemandQuery<typeof IsRegistered>
2319
getPseudonym: Queries.FromOnDemandQuery<typeof GetPseudonym>
2420
listAllPrereviewersForStats: Queries.FromStatefulQuery<typeof ListAllPrereviewersForStats>
25-
importRegisteredOrcidId: (
26-
orcidId: OrcidId.OrcidId,
27-
) => ReturnType<Commands.FromCommand<typeof ImportRegisteredPrereviewer>>
2821
importRegisteredPrereviewer: Commands.FromCommand<typeof ImportRegisteredPrereviewer>
2922
}
3023
>() {}
@@ -34,9 +27,6 @@ export const { listAllPrereviewersForStats } = Effect.serviceFunctions(Prereview
3427
export const layer = Layer.effect(
3528
Prereviewers,
3629
Effect.gen(function* () {
37-
const fetch = yield* FetchHttpClient.Fetch
38-
const legacyPrereviewApi = yield* LegacyPrereview.LegacyPrereviewApi
39-
4030
const importRegisteredPrereviewer = yield* Commands.makeCommand(ImportRegisteredPrereviewer)
4131
const registerPrereviewer = yield* Commands.makeCommand(RegisterPrereviewer)
4232

@@ -47,19 +37,6 @@ export const layer = Layer.effect(
4737
)
4838

4939
return {
50-
legacyRegister: orcid =>
51-
pipe(
52-
FptsToEffect.readerTaskEither(LegacyPrereview.createUserOnLegacyPrereview({ name: orcid, orcid }), {
53-
fetch,
54-
legacyPrereviewApi: {
55-
app: legacyPrereviewApi.app,
56-
key: Redacted.value(legacyPrereviewApi.key),
57-
url: legacyPrereviewApi.origin,
58-
},
59-
}),
60-
Effect.asVoid,
61-
Effect.mapError(() => new UnableToHandleCommand({ cause: 'Legacy user API unavailable' })),
62-
),
6340
register: Effect.fn('Prereviewers.register')(
6441
function* (orcidId) {
6542
const prereviewer = {
@@ -80,21 +57,6 @@ export const layer = Layer.effect(
8057
isRegistered: yield* Queries.makeOnDemandQuery(IsRegistered),
8158
getPseudonym: yield* Queries.makeOnDemandQuery(GetPseudonym),
8259
listAllPrereviewersForStats: yield* Queries.makeStatefulQuery(ListAllPrereviewersForStats),
83-
importRegisteredOrcidId: orcid =>
84-
pipe(
85-
FptsToEffect.readerTaskEither(LegacyPrereview.getUserFromLegacyPrereview(orcid), {
86-
fetch,
87-
legacyPrereviewApi: {
88-
app: legacyPrereviewApi.app,
89-
key: Redacted.value(legacyPrereviewApi.key),
90-
url: legacyPrereviewApi.origin,
91-
},
92-
}),
93-
Effect.mapError(() => new UnableToHandleCommand({ cause: 'Legacy user API unavailable' })),
94-
Effect.andThen(({ pseudonym, createdAt }) =>
95-
importRegisteredPrereviewer({ orcidId: orcid, pseudonym, registeredAt: createdAt }),
96-
),
97-
),
9860
importRegisteredPrereviewer,
9961
}
10062
}),

test/WebApp/log-in/log-in.test.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,6 @@ describe('authenticate', () => {
244244
'when the PREreviewer has not been registered',
245245
(code, [publicUrl, state], orcidOauth, locale, accessToken, sessionCookie, sessionId, signedSessionId) => {
246246
const registerSpy = jest.fn<(typeof Prereviewers.Service)['register']>(() => Effect.void)
247-
const importRegisteredOrcidIdSpy = jest.fn<(typeof Prereviewers.Service)['importRegisteredOrcidId']>(
248-
() => Effect.void,
249-
)
250247

251248
return Effect.gen(function* () {
252249
yield* _.authenticate(code, state)
@@ -268,7 +265,6 @@ describe('authenticate', () => {
268265
Layer.mock(Prereviewers, {
269266
isRegistered: () => Effect.succeed(false),
270267
register: registerSpy,
271-
importRegisteredOrcidId: importRegisteredOrcidIdSpy,
272268
}),
273269
Layer.succeed(PublicUrl, publicUrl),
274270
Layer.succeed(SessionStore, { cookie: sessionCookie, store: new Keyv() }),

0 commit comments

Comments
 (0)