Use the query on a page

Refs #3108

Author: thewilkybarkid

src/WebApp/request-review-flow/start-page/index.ts

@@ -1,4 +1,4 @@
-import { Effect, pipe } from 'effect'
+import { Effect, Option, pipe } from 'effect'
 import { format } from 'fp-ts-routing'
 import type * as RT from 'fp-ts/lib/ReaderTask.js'
 import * as RTE from 'fp-ts/lib/ReaderTaskEither.js'
@@ -7,12 +7,7 @@ import type { SupportedLocale } from '../../../locales/index.ts'
 import { type GetPreprintTitleEnv, getPreprintTitle } from '../../../preprint.ts'
 import type { IndeterminatePreprintId } from '../../../Preprints/index.ts'
 import { EffectToFpts } from '../../../RefactoringUtilities/index.ts'
-import {
-  type GetReviewRequestEnv,
-  type SaveReviewRequestEnv,
-  maybeGetReviewRequest,
-  saveReviewRequest,
-} from '../../../review-request.ts'
+import { type SaveReviewRequestEnv, saveReviewRequest } from '../../../review-request.ts'
 import * as ReviewRequests from '../../../ReviewRequests/index.ts'
 import { requestReviewCheckMatch, requestReviewPublishedMatch, requestReviewStartMatch } from '../../../routes.ts'
 import { Temporal, Uuid } from '../../../types/index.ts'
@@ -31,10 +26,9 @@ export const requestReviewStart = ({
   locale: SupportedLocale
 }): RT.ReaderTask<
   GetPreprintTitleEnv &
-    GetReviewRequestEnv &
     SaveReviewRequestEnv &
     Uuid.GenerateUuidEnv &
-    EffectToFpts.EffectEnv<ReviewRequests.ReviewRequestCommands>,
+    EffectToFpts.EffectEnv<ReviewRequests.ReviewRequestCommands | ReviewRequests.ReviewRequestQueries>,
   LogInResponse | PageResponse | RedirectResponse
 > =>
   pipe(
@@ -47,11 +41,15 @@ export const requestReviewStart = ({
         RTE.map(preprint => preprint.id),
       ),
     ),
-    RTE.bindW('reviewRequest', ({ preprint, user }) => pipe(maybeGetReviewRequest(user.orcid, preprint))),
+    RTE.bindW('reviewRequest', ({ preprint, user }) =>
+      EffectToFpts.toReaderTaskEither(
+        ReviewRequests.findReviewRequestByAPrereviewer({ requesterId: user.orcid, preprintId: preprint }),
+      ),
+    ),
     RTE.chainFirstW(({ preprint, reviewRequest, user }) =>
-      match(reviewRequest)
-        .with({ status: P.union('incomplete', 'completed') }, () => RTE.of(undefined))
-        .with(undefined, () =>
+      Option.match(reviewRequest, {
+        onSome: () => RTE.of(undefined),
+        onNone: () =>
           pipe(
             RTE.rightReaderIO(Uuid.generateUuidIO),
             RTE.chainFirstW(id => saveReviewRequest(user.orcid, preprint, { status: 'incomplete', id })),
@@ -68,8 +66,7 @@ export const requestReviewStart = ({
               ),
             ),
           ),
-        )
-        .exhaustive(),
+      }),
     ),
     RTE.matchW(
       error =>
@@ -79,18 +76,27 @@ export const requestReviewStart = ({
           )
           .with({ _tag: 'PreprintIsNotFound' }, 'not-found', () => pageNotFound(locale))
           .with(
-            { _tag: P.union('PreprintIsUnavailable', 'ReviewRequestWasAlreadyStarted', 'UnableToHandleCommand') },
+            {
+              _tag: P.union(
+                'PreprintIsUnavailable',
+                'ReviewRequestWasAlreadyStarted',
+                'UnableToHandleCommand',
+                'UnableToQuery',
+              ),
+            },
             'unavailable',
             () => havingProblemsPage(locale),
           )
           .exhaustive(),
       state =>
         match(state)
-          .with({ reviewRequest: undefined }, state =>
+          .with({ reviewRequest: { _tag: 'None' } }, state =>
             RedirectResponse({ location: format(requestReviewCheckMatch.formatter, { id: state.preprint }) }),
           )
-          .with({ reviewRequest: { status: 'incomplete' } }, state => carryOnPage(state.locale, state.preprint))
-          .with({ reviewRequest: { status: 'completed' } }, () =>
+          .with({ reviewRequest: { _tag: 'Some', value: { _tag: 'ReviewRequestPendingPublication' } } }, state =>
+            carryOnPage(state.locale, state.preprint),
+          )
+          .with({ reviewRequest: { _tag: 'Some', value: { _tag: 'PublishedReviewRequest' } } }, () =>
             RedirectResponse({ location: format(requestReviewPublishedMatch.formatter, { id: state.preprint }) }),
           )
           .exhaustive(),

test/WebApp/request-review-flow/request-review-start.test.ts

@@ -7,7 +7,7 @@ import * as Commands from '../../../src/Commands.ts'
 import * as ReviewRequests from '../../../src/ReviewRequests/index.ts'
 import * as StatusCodes from '../../../src/StatusCodes.ts'
 import * as _ from '../../../src/WebApp/request-review-flow/index.ts'
-import type { GetReviewRequestEnv, SaveReviewRequestEnv } from '../../../src/review-request.ts'
+import type { SaveReviewRequestEnv } from '../../../src/review-request.ts'
 import { requestReviewCheckMatch, requestReviewPublishedMatch, requestReviewStartMatch } from '../../../src/routes.ts'
 import * as EffectTest from '../../EffectTest.ts'
 import * as fc from '../../fc.ts'
@@ -24,15 +24,19 @@ describe('requestReviewStart', () => {
         fc.uuid(),
       ])('when a request can be started', (preprint, user, preprintTitle, locale, uuid) =>
         Effect.gen(function* () {
-          const runtime = yield* Effect.runtime<ReviewRequests.ReviewRequestCommands>()
-          const getReviewRequest = jest.fn<GetReviewRequestEnv['getReviewRequest']>(_ => TE.left('not-found'))
+          const findReviewRequestByAPrereviewer = jest.fn<
+            (typeof ReviewRequests.ReviewRequestQueries.Service)['findReviewRequestByAPrereviewer']
+          >(_ => Effect.succeedNone)
+          const runtime = yield* Effect.provide(
+            Effect.runtime<ReviewRequests.ReviewRequestCommands | ReviewRequests.ReviewRequestQueries>(),
+            Layer.mock(ReviewRequests.ReviewRequestQueries, { findReviewRequestByAPrereviewer }),
+          )
           const saveReviewRequest = jest.fn<SaveReviewRequestEnv['saveReviewRequest']>(_ => TE.right(undefined))
 
           const actual = yield* Effect.promise(() =>
             _.requestReviewStart({ preprint, user, locale })({
               generateUuid: () => uuid,
               getPreprintTitle: () => TE.right(preprintTitle),
-              getReviewRequest,
               runtime,
               saveReviewRequest,
             })(),
@@ -43,7 +47,10 @@ describe('requestReviewStart', () => {
             status: StatusCodes.SeeOther,
             location: format(requestReviewCheckMatch.formatter, { id: preprintTitle.id }),
           })
-          expect(getReviewRequest).toHaveBeenCalledWith(user.orcid, preprintTitle.id as never)
+          expect(findReviewRequestByAPrereviewer).toHaveBeenCalledWith({
+            requesterId: user.orcid,
+            preprintId: preprintTitle.id,
+          })
           expect(saveReviewRequest).toHaveBeenCalledWith(user.orcid, preprintTitle.id as never, {
             status: 'incomplete',
             id: uuid,
@@ -70,13 +77,14 @@ describe('requestReviewStart', () => {
           ),
       ])("when a request can't be started", (preprint, user, preprintTitle, locale, uuid, error) =>
         Effect.gen(function* () {
-          const runtime = yield* Effect.runtime<ReviewRequests.ReviewRequestCommands>()
+          const runtime = yield* Effect.runtime<
+            ReviewRequests.ReviewRequestCommands | ReviewRequests.ReviewRequestQueries
+          >()
 
           const actual = yield* Effect.promise(() =>
             _.requestReviewStart({ preprint, user, locale })({
               generateUuid: () => uuid,
               getPreprintTitle: () => TE.right(preprintTitle),
-              getReviewRequest: () => TE.left('not-found'),
               runtime,
               saveReviewRequest: () => TE.right(undefined),
             })(),
@@ -91,7 +99,14 @@ describe('requestReviewStart', () => {
             js: [],
           })
         }).pipe(
-          Effect.provide(Layer.mock(ReviewRequests.ReviewRequestCommands, { startReviewRequest: () => error })),
+          Effect.provide(
+            Layer.mergeAll(
+              Layer.mock(ReviewRequests.ReviewRequestCommands, { startReviewRequest: () => error }),
+              Layer.mock(ReviewRequests.ReviewRequestQueries, {
+                findReviewRequestByAPrereviewer: () => Effect.succeedNone,
+              }),
+            ),
+          ),
           EffectTest.run,
         ),
       )
@@ -100,19 +115,19 @@ describe('requestReviewStart', () => {
     test.prop([
       fc.indeterminatePreprintId(),
       fc.user(),
-      fc.completedReviewRequest(),
+      fc.record({ _tag: fc.constant('PublishedReviewRequest'), id: fc.uuid() }),
       fc.preprintTitle({ id: fc.preprintId() }),
       fc.supportedLocale(),
     ])('when a request has already been completed', (preprint, user, reviewRequest, preprintTitle, locale) =>
       Effect.gen(function* () {
-        const runtime = yield* Effect.runtime<ReviewRequests.ReviewRequestCommands>()
-        const getReviewRequest = jest.fn<GetReviewRequestEnv['getReviewRequest']>(_ => TE.right(reviewRequest))
+        const runtime = yield* Effect.runtime<
+          ReviewRequests.ReviewRequestCommands | ReviewRequests.ReviewRequestQueries
+        >()
 
         const actual = yield* Effect.promise(() =>
           _.requestReviewStart({ preprint, user, locale })({
             generateUuid: shouldNotBeCalled,
             getPreprintTitle: () => TE.right(preprintTitle),
-            getReviewRequest,
             runtime,
             saveReviewRequest: shouldNotBeCalled,
           })(),
@@ -123,26 +138,35 @@ describe('requestReviewStart', () => {
           status: StatusCodes.SeeOther,
           location: format(requestReviewPublishedMatch.formatter, { id: preprintTitle.id }),
         })
-        expect(getReviewRequest).toHaveBeenCalledWith(user.orcid, preprintTitle.id as never)
-      }).pipe(Effect.provide(Layer.mock(ReviewRequests.ReviewRequestCommands, {})), EffectTest.run),
+      }).pipe(
+        Effect.provide(
+          Layer.mergeAll(
+            Layer.mock(ReviewRequests.ReviewRequestCommands, {}),
+            Layer.mock(ReviewRequests.ReviewRequestQueries, {
+              findReviewRequestByAPrereviewer: () => Effect.succeedSome(reviewRequest),
+            }),
+          ),
+        ),
+        EffectTest.run,
+      ),
     )
 
     test.prop([
       fc.indeterminatePreprintId(),
       fc.user(),
-      fc.incompleteReviewRequest(),
+      fc.record({ _tag: fc.constantFrom('ReviewRequestPendingPublication'), id: fc.uuid() }),
       fc.preprintTitle({ id: fc.preprintId() }),
       fc.supportedLocale(),
     ])('when a request has already been started', (preprint, user, reviewRequest, preprintTitle, locale) =>
       Effect.gen(function* () {
-        const runtime = yield* Effect.runtime<ReviewRequests.ReviewRequestCommands>()
-        const getReviewRequest = jest.fn<GetReviewRequestEnv['getReviewRequest']>(_ => TE.right(reviewRequest))
+        const runtime = yield* Effect.runtime<
+          ReviewRequests.ReviewRequestCommands | ReviewRequests.ReviewRequestQueries
+        >()
 
         const actual = yield* Effect.promise(() =>
           _.requestReviewStart({ preprint, user, locale })({
             generateUuid: shouldNotBeCalled,
             getPreprintTitle: () => TE.right(preprintTitle),
-            getReviewRequest,
             runtime,
             saveReviewRequest: shouldNotBeCalled,
           })(),
@@ -158,22 +182,32 @@ describe('requestReviewStart', () => {
           skipToLabel: 'main',
           js: [],
         })
-        expect(getReviewRequest).toHaveBeenCalledWith(user.orcid, preprintTitle.id as never)
-      }).pipe(Effect.provide(Layer.mock(ReviewRequests.ReviewRequestCommands, {})), EffectTest.run),
+      }).pipe(
+        Effect.provide(
+          Layer.mergeAll(
+            Layer.mock(ReviewRequests.ReviewRequestCommands, {}),
+            Layer.mock(ReviewRequests.ReviewRequestQueries, {
+              findReviewRequestByAPrereviewer: () => Effect.succeedSome(reviewRequest),
+            }),
+          ),
+        ),
+        EffectTest.run,
+      ),
     )
   })
 
   test.prop([fc.indeterminatePreprintId(), fc.supportedLocale()])(
     'when the user is not logged in',
     (preprint, locale) =>
       Effect.gen(function* () {
-        const runtime = yield* Effect.runtime<ReviewRequests.ReviewRequestCommands>()
+        const runtime = yield* Effect.runtime<
+          ReviewRequests.ReviewRequestCommands | ReviewRequests.ReviewRequestQueries
+        >()
 
         const actual = yield* Effect.promise(() =>
           _.requestReviewStart({ preprint, locale })({
             generateUuid: shouldNotBeCalled,
             getPreprintTitle: shouldNotBeCalled,
-            getReviewRequest: shouldNotBeCalled,
             runtime,
             saveReviewRequest: shouldNotBeCalled,
           })(),
@@ -183,6 +217,14 @@ describe('requestReviewStart', () => {
           _tag: 'LogInResponse',
           location: format(requestReviewStartMatch.formatter, { id: preprint }),
         })
-      }).pipe(Effect.provide(Layer.mock(ReviewRequests.ReviewRequestCommands, {})), EffectTest.run),
+      }).pipe(
+        Effect.provide(
+          Layer.mergeAll(
+            Layer.mock(ReviewRequests.ReviewRequestCommands, {}),
+            Layer.mock(ReviewRequests.ReviewRequestQueries, {}),
+          ),
+        ),
+        EffectTest.run,
+      ),
   )
 })