Push up a throw #380

src/article-page/activity-page.ts

@@ -2,14 +2,9 @@ import * as O from 'fp-ts/Option';
 import * as RTE from 'fp-ts/ReaderTaskEither';
 import * as T from 'fp-ts/Task';
 import * as TE from 'fp-ts/TaskEither';
-import { pipe } from 'fp-ts/function';
+import { flow, pipe } from 'fp-ts/function';
 import striptags from 'striptags';
-import {
-  FindReviewsForArticleDoi,
-  FindVersionsForArticleDoi,
-  getArticleFeedEvents,
-  GetGroup,
-} from './get-article-feed-events';
+import { FindReviewsForArticleDoi, FindVersionsForArticleDoi, getArticleFeedEvents } from './get-article-feed-events';
 import { FetchReview } from './get-feed-events-content';
 import { projectHasUserSavedArticle } from './project-has-user-saved-article';
 import { projectReviewResponseCounts } from './project-review-response-counts';
@@ -27,6 +22,7 @@ import { renderTweetThis } from './render-tweet-this';
 import { ArticleServer } from '../types/article-server';
 import { Doi } from '../types/doi';
 import { DomainEvent } from '../types/domain-events';
+import { GroupId } from '../types/group-id';
 import { toHtmlFragment } from '../types/html-fragment';
 import { Page } from '../types/page';
 import { RenderPageError } from '../types/render-page-error';
@@ -47,6 +43,11 @@ type GetArticleDetails = (doi: Doi) => TE.TaskEither<'not-found' | 'unavailable'
   server: ArticleServer,
 }>;
 
+type GetGroup = (groupId: GroupId) => T.Task<O.Option<{
+  name: string,
+  avatarPath: string,
+}>>;
+
 type Ports = {
   fetchArticle: GetArticleDetails,
   fetchReview: FetchReview,
@@ -88,6 +89,12 @@ export const articleActivityPage: ActivityPage = (params) => (ports) => pipe(
     articleDetails.server,
     (server) => getArticleFeedEvents(doi, server, userId)({
       ...ports,
+      getGroup: flow(
+        ports.getGroup,
+        T.map(O.getOrElseW(() => {
+          throw new Error('No such group');
+        })),
+      ),
       countReviewResponses: (reviewId) => projectReviewResponseCounts(reviewId)(ports.getAllEvents),
       getUserReviewResponse: (reviewId) => projectUserReviewResponse(reviewId, userId)(ports.getAllEvents),
     }),

src/article-page/get-article-feed-events.ts

@@ -4,11 +4,12 @@ import * as RT from 'fp-ts/ReaderTask';
 import * as RA from 'fp-ts/ReadonlyArray';
 import * as RNEA from 'fp-ts/ReadonlyNonEmptyArray';
 import * as T from 'fp-ts/Task';
-import { flow, pipe } from 'fp-ts/function';
+import { pipe } from 'fp-ts/function';
 import {
   CountReviewResponses,
   FetchReview,
   getFeedEventsContent,
+  GetGroup,
   GetUserReviewResponse,
 } from './get-feed-events-content';
 import { handleArticleVersionErrors } from './handle-article-version-errors';
@@ -32,11 +33,6 @@ export type FindVersionsForArticleDoi = (doi: Doi, server: ArticleServer) => T.T
   version: number,
 }>>;
 
-export type GetGroup = (groupId: GroupId) => T.Task<O.Option<{
-  name: string,
-  avatarPath: string,
-}>>;
-
 type GetArticleFeedEvents = (
   doi: Doi,
   server: ArticleServer,
@@ -74,12 +70,7 @@ export const getArticleFeedEvents: GetArticleFeedEvents = (doi, server, userId)
   ]),
   T.chain((feedEvents) => getFeedEventsContent(feedEvents, server, userId)({
     fetchReview,
-    getGroup: flow(
-      getGroup,
-      T.map(O.getOrElseW(() => {
-        throw new Error('No such group');
-      })),
-    ),
+    getGroup,
     countReviewResponses,
     getUserReviewResponse,
   })),

src/article-page/get-feed-events-content.ts

@@ -42,7 +42,7 @@ export type CountReviewResponses = (reviewId: ReviewId) => T.Task<{ helpfulCount
 
 export type GetUserReviewResponse = (reviewId: ReviewId, userId: O.Option<UserId>) => T.Task<O.Option<'helpful' | 'not-helpful'>>;
 
-type GetGroup = (id: GroupId) => T.Task<{
+export type GetGroup = (id: GroupId) => T.Task<{
   name: string,
   avatarPath: string,
 }>;